diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-14 13:19:02 -0500 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-14 13:19:02 -0500 |
| commit | 9b896033aa2781d36b2d3f756fe70325fc8487e2 (patch) | |
| tree | 561541dae80ce870c9572cf59b46a119ce57e356 /drivers/ide/ide-probe.c | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
commit 54cc1428cfa619e16d75baae8cb041a2eff015f0 ("ide: remove
local_irq_set() macro") accidentally replaced local_save_flags()
by local_irq_set() in ide_probe_port() and __ide_wait_stat()
which resulted in LOCKDEP breakage.
Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 0ccbb4459fb9..312127ea443a 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -796,7 +796,7 @@ static int ide_probe_port(ide_hwif_t *hwif) | |||
| 796 | if (irqd) | 796 | if (irqd) |
| 797 | disable_irq(hwif->irq); | 797 | disable_irq(hwif->irq); |
| 798 | 798 | ||
| 799 | local_irq_save(flags); | 799 | local_save_flags(flags); |
| 800 | local_irq_enable_in_hardirq(); | 800 | local_irq_enable_in_hardirq(); |
| 801 | 801 | ||
| 802 | if (ide_port_wait_ready(hwif) == -EBUSY) | 802 | if (ide_port_wait_ready(hwif) == -EBUSY) |