diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/Kconfig | 26 | ||||
-rw-r--r-- | drivers/ide/ide-disk.c | 7 |
2 files changed, 19 insertions, 14 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 9827c5e686cb..76b6d98bd295 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -327,7 +327,7 @@ config BLK_DEV_OPTI621 | |||
327 | select BLK_DEV_IDEPCI | 327 | select BLK_DEV_IDEPCI |
328 | help | 328 | help |
329 | This is a driver for the OPTi 82C621 EIDE controller. | 329 | This is a driver for the OPTi 82C621 EIDE controller. |
330 | Please read the comments at the top of <file:drivers/ide/pci/opti621.c>. | 330 | Please read the comments at the top of <file:drivers/ide/opti621.c>. |
331 | 331 | ||
332 | config BLK_DEV_RZ1000 | 332 | config BLK_DEV_RZ1000 |
333 | tristate "RZ1000 chipset bugfix/support" | 333 | tristate "RZ1000 chipset bugfix/support" |
@@ -365,7 +365,7 @@ config BLK_DEV_ALI15X3 | |||
365 | normal dual channel support. | 365 | normal dual channel support. |
366 | 366 | ||
367 | Please read the comments at the top of | 367 | Please read the comments at the top of |
368 | <file:drivers/ide/pci/alim15x3.c>. | 368 | <file:drivers/ide/alim15x3.c>. |
369 | 369 | ||
370 | If unsure, say N. | 370 | If unsure, say N. |
371 | 371 | ||
@@ -528,7 +528,7 @@ config BLK_DEV_NS87415 | |||
528 | This driver adds detection and support for the NS87415 chip | 528 | This driver adds detection and support for the NS87415 chip |
529 | (used mainly on SPARC64 and PA-RISC machines). | 529 | (used mainly on SPARC64 and PA-RISC machines). |
530 | 530 | ||
531 | Please read the comments at the top of <file:drivers/ide/pci/ns87415.c>. | 531 | Please read the comments at the top of <file:drivers/ide/ns87415.c>. |
532 | 532 | ||
533 | config BLK_DEV_PDC202XX_OLD | 533 | config BLK_DEV_PDC202XX_OLD |
534 | tristate "PROMISE PDC202{46|62|65|67} support" | 534 | tristate "PROMISE PDC202{46|62|65|67} support" |
@@ -547,7 +547,7 @@ config BLK_DEV_PDC202XX_OLD | |||
547 | for more than one card. | 547 | for more than one card. |
548 | 548 | ||
549 | Please read the comments at the top of | 549 | Please read the comments at the top of |
550 | <file:drivers/ide/pci/pdc202xx_old.c>. | 550 | <file:drivers/ide/pdc202xx_old.c>. |
551 | 551 | ||
552 | If unsure, say N. | 552 | If unsure, say N. |
553 | 553 | ||
@@ -593,7 +593,7 @@ config BLK_DEV_SIS5513 | |||
593 | ATA100: SiS635, SiS645, SiS650, SiS730, SiS735, SiS740, | 593 | ATA100: SiS635, SiS645, SiS650, SiS730, SiS735, SiS740, |
594 | SiS745, SiS750 | 594 | SiS745, SiS750 |
595 | 595 | ||
596 | Please read the comments at the top of <file:drivers/ide/pci/sis5513.c>. | 596 | Please read the comments at the top of <file:drivers/ide/sis5513.c>. |
597 | 597 | ||
598 | config BLK_DEV_SL82C105 | 598 | config BLK_DEV_SL82C105 |
599 | tristate "Winbond SL82c105 support" | 599 | tristate "Winbond SL82c105 support" |
@@ -616,7 +616,7 @@ config BLK_DEV_SLC90E66 | |||
616 | look-a-like to the PIIX4 it should be a nice addition. | 616 | look-a-like to the PIIX4 it should be a nice addition. |
617 | 617 | ||
618 | Please read the comments at the top of | 618 | Please read the comments at the top of |
619 | <file:drivers/ide/pci/slc90e66.c>. | 619 | <file:drivers/ide/slc90e66.c>. |
620 | 620 | ||
621 | config BLK_DEV_TRM290 | 621 | config BLK_DEV_TRM290 |
622 | tristate "Tekram TRM290 chipset support" | 622 | tristate "Tekram TRM290 chipset support" |
@@ -625,7 +625,7 @@ config BLK_DEV_TRM290 | |||
625 | This driver adds support for bus master DMA transfers | 625 | This driver adds support for bus master DMA transfers |
626 | using the Tekram TRM290 PCI IDE chip. Volunteers are | 626 | using the Tekram TRM290 PCI IDE chip. Volunteers are |
627 | needed for further tweaking and development. | 627 | needed for further tweaking and development. |
628 | Please read the comments at the top of <file:drivers/ide/pci/trm290.c>. | 628 | Please read the comments at the top of <file:drivers/ide/trm290.c>. |
629 | 629 | ||
630 | config BLK_DEV_VIA82CXXX | 630 | config BLK_DEV_VIA82CXXX |
631 | tristate "VIA82CXXX chipset support" | 631 | tristate "VIA82CXXX chipset support" |
@@ -681,7 +681,7 @@ config BLK_DEV_IDE_AU1XXX | |||
681 | select IDE_XFER_MODE | 681 | select IDE_XFER_MODE |
682 | choice | 682 | choice |
683 | prompt "IDE Mode for AMD Alchemy Au1200" | 683 | prompt "IDE Mode for AMD Alchemy Au1200" |
684 | default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA | 684 | default BLK_DEV_IDE_AU1XXX_PIO_DBDMA |
685 | depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX | 685 | depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX |
686 | 686 | ||
687 | config BLK_DEV_IDE_AU1XXX_PIO_DBDMA | 687 | config BLK_DEV_IDE_AU1XXX_PIO_DBDMA |
@@ -836,7 +836,7 @@ config BLK_DEV_ALI14XX | |||
836 | of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster | 836 | of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster |
837 | I/O speeds to be set as well. | 837 | I/O speeds to be set as well. |
838 | See the files <file:Documentation/ide/ide.txt> and | 838 | See the files <file:Documentation/ide/ide.txt> and |
839 | <file:drivers/ide/legacy/ali14xx.c> for more info. | 839 | <file:drivers/ide/ali14xx.c> for more info. |
840 | 840 | ||
841 | config BLK_DEV_DTC2278 | 841 | config BLK_DEV_DTC2278 |
842 | tristate "DTC-2278 support" | 842 | tristate "DTC-2278 support" |
@@ -847,7 +847,7 @@ config BLK_DEV_DTC2278 | |||
847 | boot parameter. It enables support for the secondary IDE interface | 847 | boot parameter. It enables support for the secondary IDE interface |
848 | of the DTC-2278 card, and permits faster I/O speeds to be set as | 848 | of the DTC-2278 card, and permits faster I/O speeds to be set as |
849 | well. See the <file:Documentation/ide/ide.txt> and | 849 | well. See the <file:Documentation/ide/ide.txt> and |
850 | <file:drivers/ide/legacy/dtc2278.c> files for more info. | 850 | <file:drivers/ide/dtc2278.c> files for more info. |
851 | 851 | ||
852 | config BLK_DEV_HT6560B | 852 | config BLK_DEV_HT6560B |
853 | tristate "Holtek HT6560B support" | 853 | tristate "Holtek HT6560B support" |
@@ -858,7 +858,7 @@ config BLK_DEV_HT6560B | |||
858 | boot parameter. It enables support for the secondary IDE interface | 858 | boot parameter. It enables support for the secondary IDE interface |
859 | of the Holtek card, and permits faster I/O speeds to be set as well. | 859 | of the Holtek card, and permits faster I/O speeds to be set as well. |
860 | See the <file:Documentation/ide/ide.txt> and | 860 | See the <file:Documentation/ide/ide.txt> and |
861 | <file:drivers/ide/legacy/ht6560b.c> files for more info. | 861 | <file:drivers/ide/ht6560b.c> files for more info. |
862 | 862 | ||
863 | config BLK_DEV_QD65XX | 863 | config BLK_DEV_QD65XX |
864 | tristate "QDI QD65xx support" | 864 | tristate "QDI QD65xx support" |
@@ -867,7 +867,7 @@ config BLK_DEV_QD65XX | |||
867 | help | 867 | help |
868 | This driver is enabled at runtime using the "qd65xx.probe" kernel | 868 | This driver is enabled at runtime using the "qd65xx.probe" kernel |
869 | boot parameter. It permits faster I/O speeds to be set. See the | 869 | boot parameter. It permits faster I/O speeds to be set. See the |
870 | <file:Documentation/ide/ide.txt> and <file:drivers/ide/legacy/qd65xx.c> | 870 | <file:Documentation/ide/ide.txt> and <file:drivers/ide/qd65xx.c> |
871 | for more info. | 871 | for more info. |
872 | 872 | ||
873 | config BLK_DEV_UMC8672 | 873 | config BLK_DEV_UMC8672 |
@@ -879,7 +879,7 @@ config BLK_DEV_UMC8672 | |||
879 | boot parameter. It enables support for the secondary IDE interface | 879 | boot parameter. It enables support for the secondary IDE interface |
880 | of the UMC-8672, and permits faster I/O speeds to be set as well. | 880 | of the UMC-8672, and permits faster I/O speeds to be set as well. |
881 | See the files <file:Documentation/ide/ide.txt> and | 881 | See the files <file:Documentation/ide/ide.txt> and |
882 | <file:drivers/ide/legacy/umc8672.c> for more info. | 882 | <file:drivers/ide/umc8672.c> for more info. |
883 | 883 | ||
884 | endif | 884 | endif |
885 | 885 | ||
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 274798068a54..16f69be820c7 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq) | |||
435 | if (!(rq->cmd_flags & REQ_FLUSH)) | 435 | if (!(rq->cmd_flags & REQ_FLUSH)) |
436 | return BLKPREP_OK; | 436 | return BLKPREP_OK; |
437 | 437 | ||
438 | cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); | 438 | if (rq->special) { |
439 | cmd = rq->special; | ||
440 | memset(cmd, 0, sizeof(*cmd)); | ||
441 | } else { | ||
442 | cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC); | ||
443 | } | ||
439 | 444 | ||
440 | /* FIXME: map struct ide_taskfile on rq->cmd[] */ | 445 | /* FIXME: map struct ide_taskfile on rq->cmd[] */ |
441 | BUG_ON(cmd == NULL); | 446 | BUG_ON(cmd == NULL); |