[alsa-devel] [PATCH] ASoC: Return proper error if i2c_add_driver fails

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin at gmail.com>
---
 sound/soc/codecs/wm8523.c |    4 ++--
 sound/soc/codecs/wm8711.c |    4 ++--
 sound/soc/codecs/wm8737.c |    4 ++--
 sound/soc/codecs/wm8962.c |    4 ++--
 sound/soc/codecs/wm8991.c |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 7fea2c3..84b2ddc 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -559,7 +559,7 @@ static struct i2c_driver wm8523_i2c_driver = {
 
 static int __init wm8523_modinit(void)
 {
-	int ret;
+	int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8523_i2c_driver);
 	if (ret != 0) {
@@ -567,7 +567,7 @@ static int __init wm8523_modinit(void)
 		       ret);
 	}
 #endif
-	return 0;
+	return ret;
 }
 module_init(wm8523_modinit);
 
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 0b76d1d..727fb57 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -494,7 +494,7 @@ static struct i2c_driver wm8711_i2c_driver = {
 
 static int __init wm8711_modinit(void)
 {
-	int ret;
+	int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8711_i2c_driver);
 	if (ret != 0) {
@@ -509,7 +509,7 @@ static int __init wm8711_modinit(void)
 		       ret);
 	}
 #endif
-	return 0;
+	return ret;
 }
 module_init(wm8711_modinit);
 
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c
index ff95e62c..9a19a44 100644
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
@@ -728,7 +728,7 @@ static struct spi_driver wm8737_spi_driver = {
 
 static int __init wm8737_modinit(void)
 {
-	int ret;
+	int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8737_i2c_driver);
 	if (ret != 0) {
@@ -743,7 +743,7 @@ static int __init wm8737_modinit(void)
 		       ret);
 	}
 #endif
-	return 0;
+	return ret;
 }
 module_init(wm8737_modinit);
 
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 296de4e..30bc788 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -4288,7 +4288,7 @@ static struct i2c_driver wm8962_i2c_driver = {
 
 static int __init wm8962_modinit(void)
 {
-	int ret;
+	int ret = 0;
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8962_i2c_driver);
 	if (ret != 0) {
@@ -4296,7 +4296,7 @@ static int __init wm8962_modinit(void)
 		       ret);
 	}
 #endif
-	return 0;
+	return ret;
 }
 module_init(wm8962_modinit);
 
diff --git a/sound/soc/codecs/wm8991.c b/sound/soc/codecs/wm8991.c
index 7ee40da..d877487 100644
--- a/sound/soc/codecs/wm8991.c
+++ b/sound/soc/codecs/wm8991.c
@@ -1402,13 +1402,13 @@ static struct i2c_driver wm8991_i2c_driver = {
 
 static int __init wm8991_modinit(void)
 {
-	int ret;
+	int ret = 0;
 	ret = i2c_add_driver(&wm8991_i2c_driver);
 	if (ret != 0) {
 		printk(KERN_ERR "Failed to register WM8991 I2C driver: %d\n",
 		       ret);
 	}
-	return 0;
+	return ret;
 }
 module_init(wm8991_modinit);
 
-- 
1.7.5.4