summaryrefslogtreecommitdiff
path: root/drivers/parport
diff options
context:
space:
mode:
authorQiaoChong <qiaochong@loongson.cn>2019-02-09 20:59:07 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-23 14:35:24 +0100
commit89541fbb582889cfe2c1ee9524b5fe12ed0a61a7 (patch)
tree2dec74ed314f11d2b0a34ac9afcfb39662262ad6 /drivers/parport
parentc31c530c051db1e807f4b37cfd7dc179b9af3d09 (diff)
parport_pc: fix find_superio io compare code, should use equal test.
commit 21698fd57984cd28207d841dbdaa026d6061bceb upstream. In the original code before 181bf1e815a2 the loop was continuing until it finds the first matching superios[i].io and p->base. But after 181bf1e815a2 the logic changed and the loop now returns the pointer to the first mismatched array element which is then used in get_superio_dma() and get_superio_irq() and thus returning the wrong value. Fix the condition so that it now returns the correct pointer. Fixes: 181bf1e815a2 ("parport_pc: clean up the modified while loops using for") Cc: Alan Cox <alan@linux.intel.com> Cc: stable@vger.kernel.org Signed-off-by: QiaoChong <qiaochong@loongson.cn> [rewrite the commit message] Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 380916bff9e0..dee5b9e35ffd 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1377,7 +1377,7 @@ static struct superio_struct *find_superio(struct parport *p)
{
int i;
for (i = 0; i < NR_SUPERIOS; i++)
- if (superios[i].io != p->base)
+ if (superios[i].io == p->base)
return &superios[i];
return NULL;
}