diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 09:05:22 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 09:05:22 -0800 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /drivers/w1/w1_ds2433.c | |
| parent | f79b348856fbaf77e4a0c5cb08a808e5879967a9 (diff) | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
| download | kernel-crypto-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.tar.gz kernel-crypto-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.tar.xz kernel-crypto-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.zip | |
Auto-update from upstream
Diffstat (limited to 'drivers/w1/w1_ds2433.c')
| -rw-r--r-- | drivers/w1/w1_ds2433.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/w1/w1_ds2433.c b/drivers/w1/w1_ds2433.c index 279e0e0363d..1e3d98aac12 100644 --- a/drivers/w1/w1_ds2433.c +++ b/drivers/w1/w1_ds2433.c @@ -299,10 +299,8 @@ static int w1_f23_add_slave(struct w1_slave *sl) static void w1_f23_remove_slave(struct w1_slave *sl) { #ifdef CONFIG_W1_F23_CRC - if (sl->family_data) { - kfree(sl->family_data); - sl->family_data = NULL; - } + kfree(sl->family_data); + sl->family_data = NULL; #endif /* CONFIG_W1_F23_CRC */ sysfs_remove_bin_file(&sl->dev.kobj, &w1_f23_bin_attr); } |