]> git.hungrycats.org Git - linux/commitdiff
mcb: Fixed bar number assignment for the gdd
authorAndreas Werner <andreas.werner@men.de>
Tue, 3 May 2016 10:42:00 +0000 (12:42 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Fri, 3 Jun 2016 15:30:34 +0000 (11:30 -0400)
[ Upstream commit f75564d343010b025301d9548f2304f48eb25f01 ]

The bar number is found in reg2 within the gdd. Therefore
we need to change the assigment from reg1 to reg2 which
is the correct location.

Signed-off-by: Andreas Werner <andreas.werner@men.de>
Fixes: '3764e82e5' drivers: Introduce MEN Chameleon Bus
Cc: stable@vger.kernel.org # v3.15+
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/mcb/mcb-parse.c

index 00492695526354f104b115c61546142d77d47c46..b0155b05cddb63a734e752e6cafe83e5d571b660 100644 (file)
@@ -57,7 +57,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus,
        mdev->id = GDD_DEV(reg1);
        mdev->rev = GDD_REV(reg1);
        mdev->var = GDD_VAR(reg1);
-       mdev->bar = GDD_BAR(reg1);
+       mdev->bar = GDD_BAR(reg2);
        mdev->group = GDD_GRP(reg2);
        mdev->inst = GDD_INS(reg2);