diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 11:23:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-25 11:23:37 -0700 |
| commit | a37f6b84c4f3d3ca61634a7b36bf64c6ea452271 (patch) | |
| tree | 308105401c7c60f91903d6da78c938f1cc74578f /drivers/ide/ide-iops.c | |
| parent | 9d73777e500929b71dcfed16eec05f6760e345a6 (diff) | |
| parent | d7e2f36d9a92284754ed5254562766cb3d61c7ca (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide cs5520: Initialize second port's interrupt number.
ide: improve handling of Power Management requests
ide: add QUANTUM FIREBALLct20 30 with firmware APL.090 to ivb_list[]
ide: relax DMA info validity checking
ide-cd: Improve "weird block size" error message
ide-cd: Don't warn on bogus block size unless it actually matters.
ide: fix handling of unexpected IRQs vs request_irq()
Diffstat (limited to 'drivers/ide/ide-iops.c')
| -rw-r--r-- | drivers/ide/ide-iops.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index fa047150a1c..2892b242bbe 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -210,6 +210,7 @@ EXPORT_SYMBOL_GPL(ide_in_drive_list); */ static const struct drive_list_entry ivb_list[] = { { "QUANTUM FIREBALLlct10 05" , "A03.0900" }, + { "QUANTUM FIREBALLlct20 30" , "APL.0900" }, { "TSSTcorp CDDVDW SH-S202J" , "SB00" }, { "TSSTcorp CDDVDW SH-S202J" , "SB01" }, { "TSSTcorp CDDVDW SH-S202N" , "SB00" }, @@ -329,9 +330,6 @@ int ide_driveid_update(ide_drive_t *drive) kfree(id); - if ((drive->dev_flags & IDE_DFLAG_USING_DMA) && ide_id_dma_bug(drive)) - ide_dma_off(drive); - return 1; out_err: if (rc == 2) |