From a6485d29cfa07ec7ea1ef6bac96fa311f3788e3a Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 14 Jan 2008 21:53:31 +0100 Subject: [PATCH] --- yaml --- r: 75471 b: refs/heads/master c: 5cd6e675f862568ad73c061665ee5080cfd952c5 h: refs/heads/master i: 75469: 0ed6a020b7de7217e5d5a80736e6a8ee4240287a 75467: 53fdd8d9388f65b3774be98c05cb8c286a56dac2 75463: 7c873779d0e451313e5530ed7eb19a02818990cd 75455: 0574f19d0ca32b0803ffe44135c8a26d1127cd12 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-sibyte.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 257f196e670e..0538089c5894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9dd0194ff23d612e463be764d73da7825da4aa1 +refs/heads/master: 5cd6e675f862568ad73c061665ee5080cfd952c5 diff --git a/trunk/drivers/i2c/busses/i2c-sibyte.c b/trunk/drivers/i2c/busses/i2c-sibyte.c index 0ca599d3b402..503a134ec803 100644 --- a/trunk/drivers/i2c/busses/i2c-sibyte.c +++ b/trunk/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; }