diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-04 23:47:39 +0000 |
| commit | b71951d63d83194d449e8ec7b28c3f30176e8208 (patch) | |
| tree | 47b264ebcd35a947fef2dbd074bbe04760bc6474 /sound/soc/codecs/uda1380.c | |
| parent | dd85ecc269a3aa537fd045e113b4755a3cd1284f (diff) | |
| parent | 570a2429e964f8d63338b3450ba801a263b29b3a (diff) | |
| download | linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.bz2 | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
| -rw-r--r-- | sound/soc/codecs/uda1380.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index d08b91dde53d..39c228c89e46 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -863,13 +863,13 @@ static struct i2c_driver uda1380_i2c_driver = { static int __init uda1380_modinit(void) { - int ret; + int ret = 0; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&uda1380_i2c_driver); if (ret != 0) pr_err("Failed to register UDA1380 I2C driver: %d\n", ret); #endif - return 0; + return ret; } module_init(uda1380_modinit); |