]> git.itanic.dy.fi Git - linux-stable/commitdiff
parport_pc: fix find_superio io compare code, should use equal test.
authorQiaoChong <qiaochong@loongson.cn>
Sat, 9 Feb 2019 20:59:07 +0000 (20:59 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Mar 2019 07:44:37 +0000 (08:44 +0100)
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>
drivers/parport/parport_pc.c

index bdce0679674cc0edc3830afbf2523bd35816612b..02e6485c1ed5c585bb5d0ca9cb4641a51f32cb2e 100644 (file)
@@ -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;
 }