diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/s390/cio/cmf.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/s390/cio/cmf.c')
| -rw-r--r-- | drivers/s390/cio/cmf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c index c05b069c2996..b978f7fe8327 100644 --- a/drivers/s390/cio/cmf.c +++ b/drivers/s390/cio/cmf.c | |||
| @@ -642,8 +642,7 @@ static void | |||
| 642 | free_cmbe (struct ccw_device *cdev) | 642 | free_cmbe (struct ccw_device *cdev) |
| 643 | { | 643 | { |
| 644 | spin_lock_irq(cdev->ccwlock); | 644 | spin_lock_irq(cdev->ccwlock); |
| 645 | if (cdev->private->cmb) | 645 | kfree(cdev->private->cmb); |
| 646 | kfree(cdev->private->cmb); | ||
| 647 | cdev->private->cmb = NULL; | 646 | cdev->private->cmb = NULL; |
| 648 | spin_unlock_irq(cdev->ccwlock); | 647 | spin_unlock_irq(cdev->ccwlock); |
| 649 | 648 | ||