From 0b8ac80b6860e6acb4ed62da2e9591219e11eabe Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 30 Oct 2005 16:32:27 +0000 Subject: [PATCH] --- yaml --- r: 11955 b: refs/heads/master c: e32e28edc3d894201e15b19df627af66023aa91f h: refs/heads/master i: 11953: 7ea02a72180bc519633f8fc9d6e4eea5a35cd089 11951: a82d957d540ea1849cb8539d6fc3739b8134adc5 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c86db174c530..0a2746465c31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbbf508d6403f9dfeeb040d9cd7366e395632e59 +refs/heads/master: e32e28edc3d894201e15b19df627af66023aa91f diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c index a1268e534254..1b582262e677 100644 --- a/trunk/drivers/i2c/busses/i2c-s3c2410.c +++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c @@ -918,8 +918,11 @@ static int __init i2c_adap_s3c_init(void) int ret; ret = driver_register(&s3c2410_i2c_driver); - if (ret == 0) - ret = driver_register(&s3c2440_i2c_driver); + if (ret == 0) { + ret = driver_register(&s3c2440_i2c_driver); + if (ret) + driver_unregister(&s3c2410_i2c_driver); + } return ret; }