diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/i2c/busses/i2c-amd756-s4882.c | |
| parent | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines (diff) | |
| parent | [PATCH] Fix sysctl unregistration oops (CVE-2005-2709) (diff) | |
| download | linux-a892acacd3a8546ac161526522f13b5174f2c471.tar.xz linux-a892acacd3a8546ac161526522f13b5174f2c471.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/i2c/busses/i2c-amd756-s4882.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-amd756-s4882.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c index f51ab652300a..56c7d987590f 100644 --- a/drivers/i2c/busses/i2c-amd756-s4882.c +++ b/drivers/i2c/busses/i2c-amd756-s4882.c @@ -245,10 +245,8 @@ static void __exit amd756_s4882_exit(void) kfree(s4882_adapter); s4882_adapter = NULL; } - if (s4882_algo) { - kfree(s4882_algo); - s4882_algo = NULL; - } + kfree(s4882_algo); + s4882_algo = NULL; /* Restore physical bus */ if (i2c_add_adapter(&amd756_smbus)) |