diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:25 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 20:15:25 +0200 |
| commit | b5479167f4206e0d821a51ae149d921cd7a58e54 (patch) | |
| tree | 3303f6e1b4b42a08fec46123814d84ea339ccfcd /drivers/ide/ide-probe.c | |
| parent | 4465461ece2b9249d6c0cf57bc0002100823e361 (diff) | |
| download | kernel_goldelico_gta04-b5479167f4206e0d821a51ae149d921cd7a58e54.zip kernel_goldelico_gta04-b5479167f4206e0d821a51ae149d921cd7a58e54.tar.gz kernel_goldelico_gta04-b5479167f4206e0d821a51ae149d921cd7a58e54.tar.bz2 | |
ide: fix locking in drive_release_dev()
* Request queue cleanup should happen before freeing drive->id
and marking device as non-present. Fix it.
* Remove superfluous hwif->lock acquiring/releasing.
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 5488645..7c1f1bf 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -942,20 +942,16 @@ EXPORT_SYMBOL_GPL(ide_init_disk); static void drive_release_dev (struct device *dev) { ide_drive_t *drive = container_of(dev, ide_drive_t, gendev); - ide_hwif_t *hwif = drive->hwif; ide_proc_unregister_device(drive); - spin_lock_irq(&hwif->lock); + blk_cleanup_queue(drive->queue); + drive->queue = NULL; + kfree(drive->id); drive->id = NULL; + drive->dev_flags &= ~IDE_DFLAG_PRESENT; - /* Messed up locking ... */ - spin_unlock_irq(&hwif->lock); - blk_cleanup_queue(drive->queue); - spin_lock_irq(&hwif->lock); - drive->queue = NULL; - spin_unlock_irq(&hwif->lock); complete(&drive->gendev_rel_comp); } |