diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 01:42:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-01 01:42:07 +0400 |
| commit | dd1a47c21ee4f4f682285ad9d4624d2cec436f93 (patch) | |
| tree | eb25419d0c4a3e044aa8f3d0d2ffe87c02ad0a70 /drivers/s390/block/dasd_genhd.c | |
| parent | 22db37ec5fd51b0c77b1dd5751b1cdc2672c08d6 (diff) | |
| parent | 7b7db1b59563aebe2f4d2ba850468afb2c87c82a (diff) | |
| download | linux-dd1a47c21ee4f4f682285ad9d4624d2cec436f93.tar.xz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: unsolicited interrupts during sense pgid.
[S390] cio: no path after machine check.
[S390] cio: kernel stack overflow.
[S390] dasd: fix device shutdown process.
[S390] broken copy_in_user function.
Diffstat (limited to 'drivers/s390/block/dasd_genhd.c')
| -rw-r--r-- | drivers/s390/block/dasd_genhd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index 4c272b70f41a..d163632101d2 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -83,10 +83,12 @@ dasd_gendisk_alloc(struct dasd_device *device) void dasd_gendisk_free(struct dasd_device *device) { - del_gendisk(device->gdp); - device->gdp->queue = NULL; - put_disk(device->gdp); - device->gdp = NULL; + if (device->gdp) { + del_gendisk(device->gdp); + device->gdp->queue = NULL; + put_disk(device->gdp); + device->gdp = NULL; + } } /* |