From 20041cbfe1d4473f325b1ab897988fb67903c004 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 1 May 2008 10:53:50 +0000 Subject: [PATCH] Fix an error path. If initialization fails, we want to restore the physical bus, not delete it again. Backported from Linux 2.6. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5217 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + kernel/busses/i2c-amd756-s4882.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a609d92a..dd47b8ed 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,7 @@ lm_sensors CHANGES file SVN-HEAD Library: Don't choke on unrecognized devices, part 2 + Module i2c-amd756-s4882: Fix an error path (2.6 backport) Module i2c-i801: Drop broken I2C block read support Module i2c-piix4: Minor cleanups (2.6 backport) Module i2c-sis5595: Minor cleanups (2.6 backport) diff --git a/kernel/busses/i2c-amd756-s4882.c b/kernel/busses/i2c-amd756-s4882.c index 0707c1dc..babc9182 100644 --- a/kernel/busses/i2c-amd756-s4882.c +++ b/kernel/busses/i2c-amd756-s4882.c @@ -230,7 +230,8 @@ ERROR2: kfree(s4882_adapter); s4882_adapter = NULL; ERROR1: - i2c_del_adapter(&amd756_smbus); + /* Restore physical bus */ + i2c_add_adapter(&amd756_smbus); ERROR0: return error; }