diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 08:18:25 +0300 |
| commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
| tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/s390/block/dasd_devmap.c | |
| parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
| parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
| download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/s390/block/dasd_devmap.c')
| -rw-r--r-- | drivers/s390/block/dasd_devmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index bda896d9d788..caee16a3dc62 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c @@ -387,8 +387,7 @@ dasd_add_busid(char *bus_id, int features) new = 0; } spin_unlock(&dasd_devmap_lock); - if (new) - kfree(new); + kfree(new); return devmap; } |