diff options
author | Mark Brown | 2011-12-05 00:47:39 +0100 |
---|---|---|
committer | Mark Brown | 2011-12-05 00:47:39 +0100 |
commit | b71951d63d83194d449e8ec7b28c3f30176e8208 (patch) | |
tree | 47b264ebcd35a947fef2dbd074bbe04760bc6474 /sound/soc/codecs/uda1380.c | |
parent | ASoC: Make SND_SOC_LITTLEMILL select MFD_WM8994 (diff) | |
parent | ASoC: Make SND_SOC_MX27VIS_AIC32X4 depend on I2C (diff) | |
download | kernel-qcow2-linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.gz kernel-qcow2-linux-b71951d63d83194d449e8ec7b28c3f30176e8208.tar.xz kernel-qcow2-linux-b71951d63d83194d449e8ec7b28c3f30176e8208.zip |
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); |