diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2008-01-14 21:53:31 +0100 |
|---|---|---|
| committer |   Jean Delvare <khali@hyperion.delvare> | 2008-01-14 21:53:31 +0100 |
| commit | 5cd6e675f862568ad73c061665ee5080cfd952c5 (patch) | |
| tree | 2a1d65b3a80ffaa21cd9e6835c8d35fb44c91865 | |
| parent | i2c: Driver IDs are optional (diff) | |
| download | linux-dev-5cd6e675f862568ad73c061665ee5080cfd952c5.tar.xz linux-dev-5cd6e675f862568ad73c061665ee5080cfd952c5.zip | |
i2c-sibyte: Fix an error path
If the registration of the second I2C channel fails, we really want to
unregister the first one before we return with an error.
While we're here, fix the printk right above so that it displays the
real driver name.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-sibyte.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c index 0ca599d3b402..503a134ec803 100644 --- a/drivers/i2c/busses/i2c-sibyte.c +++ b/drivers/i2c/busses/i2c-sibyte.c @@ -200,11 +200,14 @@ static struct i2c_adapter sibyte_board_adapter[2] = { static int __init i2c_sibyte_init(void) { - printk("i2c-swarm.o: i2c SMBus adapter module for SiByte board\n"); + pr_info("i2c-sibyte: i2c SMBus adapter module for SiByte board\n"); if (i2c_sibyte_add_bus(&sibyte_board_adapter[0], K_SMB_FREQ_100KHZ) < 0) return -ENODEV; - if (i2c_sibyte_add_bus(&sibyte_board_adapter[1], K_SMB_FREQ_400KHZ) < 0) + if (i2c_sibyte_add_bus(&sibyte_board_adapter[1], + K_SMB_FREQ_400KHZ) < 0) { + i2c_del_adapter(&sibyte_board_adapter[0]); return -ENODEV; + } return 0; } |