Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd6e675 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

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: default avatarJean Delvare <khali@linux-fr.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
parent f9dd0194

drivers/i2c/busses/i2c-sibyte.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

}