summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2016-08-30 16:47:02 +0100
committerTejun Heo <tj@kernel.org>2016-08-30 11:59:47 -0400
commit9ebae9e4bcd7dff22536af8a969d8f66e6f23900 (patch)
treeba889d72dd4370096ded458db27704d1d139309c /drivers/ata
parent9b4b3f6a062b22550e62523efe5213776cdd426b (diff)
downloadlinux-stable-9ebae9e4bcd7dff22536af8a969d8f66e6f23900.tar.gz
linux-stable-9ebae9e4bcd7dff22536af8a969d8f66e6f23900.tar.bz2
linux-stable-9ebae9e4bcd7dff22536af8a969d8f66e6f23900.zip
pata_ninja32: Avoid corrupting status flags
Ninja32 needs to set some flags to indicate it does 32bit IO. However it currently assigns this which loses the initializing flag and causes a warning spew. Fix it to use a logical or as is intended. Signed-off-by: Alan Cox <alan@linux.intel.com> Tested-by: Ellmar Stelnberger <estellnb@elstel.org> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_ninja32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
index 633aa2934a18..44f97ad3c88d 100644
--- a/drivers/ata/pata_ninja32.c
+++ b/drivers/ata/pata_ninja32.c
@@ -144,7 +144,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)
ap->ioaddr.altstatus_addr = base + 0x1E;
ap->ioaddr.bmdma_addr = base;
ata_sff_std_ports(&ap->ioaddr);
- ap->pflags = ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;
+ ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;
ninja32_program(base);
/* FIXME: Should we disable them at remove ? */