aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/libata-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 90ed2b9a34de..74c4cd9ad82b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3355,7 +3355,7 @@ int ata_std_prereset(struct ata_port *ap, unsigned long deadline)
3355 return 0; 3355 return 0;
3356 3356
3357 /* if SATA, resume phy */ 3357 /* if SATA, resume phy */
3358 if (ap->cbl == ATA_CBL_SATA) { 3358 if (ap->flags & ATA_FLAG_SATA) {
3359 rc = sata_phy_resume(ap, timing, deadline); 3359 rc = sata_phy_resume(ap, timing, deadline);
3360 /* whine about phy resume failure but proceed */ 3360 /* whine about phy resume failure but proceed */
3361 if (rc && rc != -EOPNOTSUPP) 3361 if (rc && rc != -EOPNOTSUPP)
@@ -5656,7 +5656,7 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance)
5656 */ 5656 */
5657int sata_scr_valid(struct ata_port *ap) 5657int sata_scr_valid(struct ata_port *ap)
5658{ 5658{
5659 return ap->cbl == ATA_CBL_SATA && ap->ops->scr_read; 5659 return (ap->flags & ATA_FLAG_SATA) && ap->ops->scr_read;
5660} 5660}
5661 5661
5662/** 5662/**
@@ -6323,7 +6323,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
6323 if (!ata_port_is_dummy(ap)) 6323 if (!ata_port_is_dummy(ap))
6324 ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p " 6324 ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p "
6325 "ctl 0x%p bmdma 0x%p irq %d\n", 6325 "ctl 0x%p bmdma 0x%p irq %d\n",
6326 ap->cbl == ATA_CBL_SATA ? 'S' : 'P', 6326 (ap->flags & ATA_FLAG_SATA) ? 'S' : 'P',
6327 ata_mode_string(xfer_mask), 6327 ata_mode_string(xfer_mask),
6328 ap->ioaddr.cmd_addr, 6328 ap->ioaddr.cmd_addr,
6329 ap->ioaddr.ctl_addr, 6329 ap->ioaddr.ctl_addr,