summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Werner <andreas.werner@men.de>2016-05-03 12:42:00 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-01 12:17:02 -0700
commita2cdcb8296b549b250396d5056ddc28672b3db6f (patch)
tree01c92195ae3f3356c5f8643ded5546fa4280da62
parente0a343f02800b9a7b6990a8891483f8a16b7dbef (diff)
downloadlinux-stable-a2cdcb8296b549b250396d5056ddc28672b3db6f.tar.gz
linux-stable-a2cdcb8296b549b250396d5056ddc28672b3db6f.tar.bz2
linux-stable-a2cdcb8296b549b250396d5056ddc28672b3db6f.zip
mcb: Fixed bar number assignment for the gdd
commit f75564d343010b025301d9548f2304f48eb25f01 upstream. 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 Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mcb/mcb-parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c
index 004926955263..b0155b05cddb 100644
--- a/drivers/mcb/mcb-parse.c
+++ b/drivers/mcb/mcb-parse.c
@@ -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);