|
@@ -285,10 +285,11 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
|
|
|
unsigned char *buf, unsigned int buflen, int rw)
|
|
|
{
|
|
|
int slop = buflen & 3;
|
|
|
+ struct ata_port *ap = dev->link->ap;
|
|
|
+
|
|
|
/* 32bit I/O capable *and* we need to write a whole number of dwords */
|
|
|
if (ata_id_has_dword_io(dev->id) && (slop == 0 || slop == 3)
|
|
|
&& (ap->pflags & ATA_PFLAG_PIO32)) {
|
|
|
- struct ata_port *ap = dev->link->ap;
|
|
|
unsigned long flags;
|
|
|
|
|
|
local_irq_save(flags);
|
|
@@ -866,7 +867,7 @@ static struct legacy_controller controllers[] = {
|
|
|
0, 0, NULL },
|
|
|
{"PDC20230", &pdc20230_port_ops, 0x7,
|
|
|
ATA_FLAG_NO_IORDY,
|
|
|
- ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32_CHANGE, NULL },
|
|
|
+ ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE, NULL },
|
|
|
{"HT6560A", &ht6560a_port_ops, 0x07,
|
|
|
ATA_FLAG_NO_IORDY, 0, NULL },
|
|
|
{"HT6560B", &ht6560b_port_ops, 0x1F,
|
|
@@ -877,13 +878,13 @@ static struct legacy_controller controllers[] = {
|
|
|
0, 0, NULL },
|
|
|
{"QDI6500", &qdi6500_port_ops, 0x07,
|
|
|
ATA_FLAG_NO_IORDY,
|
|
|
- ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32_CHANGE, qdi_port },
|
|
|
+ ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE, qdi_port },
|
|
|
{"QDI6580", &qdi6580_port_ops, 0x1F,
|
|
|
- 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32_CHANGE, qdi_port },
|
|
|
+ 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE, qdi_port },
|
|
|
{"QDI6580DP", &qdi6580dp_port_ops, 0x1F,
|
|
|
- 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32_CHANGE, qdi_port },
|
|
|
+ 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE, qdi_port },
|
|
|
{"W83759A", &winbond_port_ops, 0x1F,
|
|
|
- 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32_CHANGE,
|
|
|
+ 0, ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE,
|
|
|
winbond_port }
|
|
|
};
|
|
|
|