aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Werner <andreas.werner@men.de>2016-05-03 12:42:00 +0200
committerSasha Levin <sasha.levin@oracle.com>2016-06-03 11:30:34 -0400
commit9b08a8746f9d6ba502f2ac757ac77d52735a1bda (patch)
tree67088fc22dced8bb6087fe7c75277a2e16191034
parentcfdb3f91f80c6585260abc4eee16fb5d8a1a3f56 (diff)
downloadlinux-linaro-stable-9b08a8746f9d6ba502f2ac757ac77d52735a1bda.tar.gz
mcb: Fixed bar number assignment for the gdd
[ 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>
-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);