| Message ID | 1408397043-16104-1-git-send-email-dann.frazier@canonical.com |
|---|---|
| State | New |
| Headers | show |
Chris - I added your Acked-by to the patch.
On 08/18/2014 04:24 PM, dann frazier wrote: > From: Suman Tripathi <stripathi@apm.com> > > BugLink: http://bugs.launchpad.net/bugs/1358498 > > This patch removes the NCQ support from the APM X-Gene SoC AHCI > Host Controller driver as it doesn't support it. > > Signed-off-by: Loc Ho <lho@apm.com> > Signed-off-by: Suman Tripathi <stripathi@apm.com> > Signed-off-by: Tejun Heo <tj@kernel.org> > Cc: stable@vger.kernel.org > (cherry-picked from 72f79f9e35bd3f78ee8853f2fcacaa197d23ebac in linux-next) > (backported to Ubuntu's 3.13) > Signed-off-by: dann frazier <dann.frazier@canonical.com> > --- > drivers/ata/ahci_xgene.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c > index ebafa8b..961735d 100644 > --- a/drivers/ata/ahci_xgene.c > +++ b/drivers/ata/ahci_xgene.c > @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = { > }; > > static const struct ata_port_info xgene_ahci_port_info = { > - AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ), > - .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, > + AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ), > + .flags = AHCI_FLAG_COMMON, > .pio_mask = ATA_PIO4, > .udma_mask = ATA_UDMA6, > .port_ops = &xgene_ahci_ops, >
diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index ebafa8b..961735d 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -344,8 +344,8 @@ static struct ata_port_operations xgene_ahci_ops = { }; static const struct ata_port_info xgene_ahci_port_info = { - AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_YES_NCQ), - .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, + AHCI_HFLAGS(AHCI_HFLAG_NO_PMP | AHCI_HFLAG_NO_NCQ), + .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, .port_ops = &xgene_ahci_ops,