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-05-03 15:52:28 -0700
commitf75564d343010b025301d9548f2304f48eb25f01 (patch)
tree663646753ddda075d2f669ba2bf1efedbd6f959a
parentd19366f1d66705d9b07e9beff9c50896606b8e44 (diff)
downloadlinux-f75564d343010b025301d9548f2304f48eb25f01.tar.bz2
mcb: Fixed bar number assignment for the gdd
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>
-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 35f385b59221..dbecbed0d258 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);