projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
sata_mv.c
diff --git
a/drivers/scsi/sata_mv.c
b/drivers/scsi/sata_mv.c
index 0f7d334aadcc0531313c6310bd60ef909b113a95..dc54f294fac8d287e3d0542bded48821eb9ce6a2 100644
(file)
--- a/
drivers/scsi/sata_mv.c
+++ b/
drivers/scsi/sata_mv.c
@@
-87,7
+87,7
@@
enum {
MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */
MV_COMMON_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */
MV_COMMON_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
- ATA_FLAG_
NO_ATAPI
),
+ ATA_FLAG_
PIO_POLLING
),
MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
CRQB_FLAG_READ = (1 << 0),
MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE,
CRQB_FLAG_READ = (1 << 0),
@@
-1397,7
+1397,7
@@
static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
}
}
}
}
- if (ap
->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR
))
+ if (ap
&& (ap->flags & ATA_FLAG_PORT_DISABLED
))
continue;
err_mask = ac_err_mask(ata_status);
continue;
err_mask = ac_err_mask(ata_status);
@@
-1418,7
+1418,7
@@
static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
VPRINTK("port %u IRQ found for qc, "
"ata_status 0x%x\n", port,ata_status);
/* mark qc status appropriately */
VPRINTK("port %u IRQ found for qc, "
"ata_status 0x%x\n", port,ata_status);
/* mark qc status appropriately */
- if (!(qc->tf.
ctl & ATA_NIEN
)) {
+ if (!(qc->tf.
flags & ATA_TFLAG_POLLING
)) {
qc->err_mask |= err_mask;
ata_qc_complete(qc);
}
qc->err_mask |= err_mask;
ata_qc_complete(qc);
}