From 99724ee478b3b1df1a9e38052f0dd6adaa32077c Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 29 Apr 2008 23:11:38 +0200 Subject: [PATCH] --- yaml --- r: 94915 b: refs/heads/master c: ee56d977423a58b53fd0fc1ef0aca0c9cb564c53 h: refs/heads/master i: 94913: ec12f50464cd3271336c5956cb9b4f068806e065 94911: d9f26c8292ecdde7890db729054e85713780877e v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-amd756-s4882.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 93739e52e42a..034e277446e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 306f39f8f2ecf896ae761748843b148b90d3494d +refs/heads/master: ee56d977423a58b53fd0fc1ef0aca0c9cb564c53 diff --git a/trunk/drivers/i2c/busses/i2c-amd756-s4882.c b/trunk/drivers/i2c/busses/i2c-amd756-s4882.c index e5e96c817566..c38a0a112208 100644 --- a/trunk/drivers/i2c/busses/i2c-amd756-s4882.c +++ b/trunk/drivers/i2c/busses/i2c-amd756-s4882.c @@ -1,7 +1,7 @@ /* * i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard * - * Copyright (C) 2004 Jean Delvare + * Copyright (C) 2004, 2008 Jean Delvare * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,7 +231,8 @@ static int __init amd756_s4882_init(void) kfree(s4882_adapter); s4882_adapter = NULL; ERROR1: - i2c_del_adapter(&amd756_smbus); + /* Restore physical bus */ + i2c_add_adapter(&amd756_smbus); ERROR0: return error; }