---

yaml
---
r: 205203
b: refs/heads/master
c: 728e0ea
h: refs/heads/master
i:
  205201: 13b0a24
  205199: 1c02e9c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b429dd5998d6037e0057564f3894f56aff64d661
+refs/heads/master: 728e0eaf99631d197e5158e21b4a8c4335a39231

trunk/drivers/ata/ata_generic.c

@@ -54,7 +54,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused)
 	const struct pci_device_id *id = ap->host->private_data;
 	int dma_enabled = 0;
 	struct ata_device *dev;
-	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 
 	if (id->driver_data & ATA_GEN_FORCE_DMA) {
 		dma_enabled = 0xff;
@@ -63,9 +62,6 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused)
 		dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
 	}
 
-	if (pdev->vendor == PCI_VENDOR_ID_CENATEK)
-		dma_enabled = 0xFF;
-
 	ata_for_each_dev(dev, link, ENABLED) {
 		/* We don't really care */
 		dev->pio_mode = XFER_PIO_0;