diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /drivers/ata/ata_generic.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/ata/ata_generic.c')
| -rw-r--r-- | drivers/ata/ata_generic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 5c33767e66de..dc48a6398abe 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
| @@ -57,10 +57,7 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) | |||
| 57 | if (pdev->vendor == PCI_VENDOR_ID_CENATEK) | 57 | if (pdev->vendor == PCI_VENDOR_ID_CENATEK) |
| 58 | dma_enabled = 0xFF; | 58 | dma_enabled = 0xFF; |
| 59 | 59 | ||
| 60 | ata_link_for_each_dev(dev, link) { | 60 | ata_for_each_dev(dev, link, ENABLED) { |
| 61 | if (!ata_dev_enabled(dev)) | ||
| 62 | continue; | ||
| 63 | |||
| 64 | /* We don't really care */ | 61 | /* We don't really care */ |
| 65 | dev->pio_mode = XFER_PIO_0; | 62 | dev->pio_mode = XFER_PIO_0; |
| 66 | dev->dma_mode = XFER_MW_DMA_0; | 63 | dev->dma_mode = XFER_MW_DMA_0; |