aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-04-29 17:11:38 -0400
committerJean Delvare <khali@hyperion.delvare>2008-04-29 17:11:38 -0400
commitee56d977423a58b53fd0fc1ef0aca0c9cb564c53 (patch)
tree343b2427127b4fcc98c35d5d729c309b1f42e27a /drivers/i2c/busses
parent306f39f8f2ecf896ae761748843b148b90d3494d (diff)
i2c-amd756-s4882: Fix an error path
If initialization fails, we want to restore the physical bus, not delete it again. Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-amd756-s4882.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index e5e96c817566..c38a0a112208 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard 2 * i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard
3 * 3 *
4 * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> 4 * Copyright (C) 2004, 2008 Jean Delvare <khali@linux-fr.org>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
@@ -231,7 +231,8 @@ ERROR2:
231 kfree(s4882_adapter); 231 kfree(s4882_adapter);
232 s4882_adapter = NULL; 232 s4882_adapter = NULL;
233ERROR1: 233ERROR1:
234 i2c_del_adapter(&amd756_smbus); 234 /* Restore physical bus */
235 i2c_add_adapter(&amd756_smbus);
235ERROR0: 236ERROR0:
236 return error; 237 return error;
237} 238}