summaryrefslogtreecommitdiffstats
path: root/drivers/mcb
diff options
context:
space:
mode:
authorAndreas Werner <andreas.werner@men.de>2016-05-03 12:42:00 +0200
committerBen Hutchings <ben@decadent.org.uk>2016-08-22 22:37:53 +0100
commit096eb844e733d132601f5cb5e220eea2854df034 (patch)
tree2b4f2454bd0056945c52b4592cde5d4993b36d4c /drivers/mcb
parent249dc9948ca6e5994eb6b0a80a04f10bed0ae903 (diff)
downloadlinux-stable-096eb844e733d132601f5cb5e220eea2854df034.tar.gz
linux-stable-096eb844e733d132601f5cb5e220eea2854df034.tar.bz2
linux-stable-096eb844e733d132601f5cb5e220eea2854df034.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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/mcb')
-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);