luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: ide_unregister() warm-plug bugfix

Browse Source 
Fix ide_unregister() to work for ports with no devices attached to them.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-05 20:30:51 +02:00
parent 7cd95f56cb
commit bd8a59e297
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/ide.c
View File

@ -315,13 +315,14 @@ void ide_unregister(ide_hwif_t *hwif)
BUG_ON(in_interrupt()); BUG_ON(in_interrupt());
BUG_ON(irqs_disabled()); BUG_ON(irqs_disabled());
mutex_lock(&ide_cfg_mtx); mutex_lock(&ide_cfg_mtx);
spin_lock_irq(&ide_lock); spin_lock_irq(&ide_lock);
if (!hwif->present) if (hwif->present) {
goto abort;
__ide_port_unregister_devices(hwif); __ide_port_unregister_devices(hwif);
hwif->present = 0; hwif->present = 0;
}
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);
ide_proc_unregister_port(hwif); ide_proc_unregister_port(hwif);
@ -359,7 +360,6 @@ void ide_unregister(ide_hwif_t *hwif)
/* restore hwif data to pristine status */ /* restore hwif data to pristine status */
ide_init_port_data(hwif, hwif->index); ide_init_port_data(hwif, hwif->index);
abort:
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);
mutex_unlock(&ide_cfg_mtx); mutex_unlock(&ide_cfg_mtx);
} }