diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 22:51:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 22:51:26 -0500 |
| commit | c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb (patch) | |
| tree | d2dcc94bb6c8426c09d6847c8184d17e8b4f71a0 /drivers/ide/ide-probe.c | |
| parent | 9316fcacb89c59fe556c48587ac02cd7f5d38045 (diff) | |
| parent | e720b9e498b6bbb1b4f3b3d2f8e9a78578aafef7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
IDE: fix sparse signed-ness errors with host->host_busy
ide: fix suspend regression
tx4938ide: Fix build error due to read_sff_dma_status moving
ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
sl82c105: remove dead code
via82cxxx: fix cable warning message
ide: can't use SSD/non-rotational queue flag for all CFA devices
it821x.c: use dev->revision instead of pci_read_config_byte
it821x: Add ultra_mask quirk for Vortex86SX
ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
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) |