From f31830cec09014dc5fdb7f536bb0262c19295a3a Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Thu, 29 Nov 2012 06:42:12 +0000 Subject: [PATCH] --- yaml --- r: 345047 b: refs/heads/master c: 0582c0fafc36e4a1f2067ea8377c9902cc7997bf h: refs/heads/master i: 345045: 1194ccc421c95c685578976175dc60c11c918c7f 345043: 2a4390cda61a54f838ef8147a7f2b8ba8c8b37d6 345039: aad7be89378d7b9e39840e914dc24fba234ffa92 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps65910.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3ec4efd1db1f..5c6a246d1757 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e5fca8106199f5c680bb93e75c16381c4c256ce +refs/heads/master: 0582c0fafc36e4a1f2067ea8377c9902cc7997bf diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c index c160c2d76f79..d5ef3a5b16b1 100644 --- a/trunk/drivers/mfd/tps65910.c +++ b/trunk/drivers/mfd/tps65910.c @@ -211,7 +211,7 @@ static struct regmap_irq_chip tps65911_irq_chip = { .irq_reg_stride = 2, .status_base = TPS65910_INT_STS, .mask_base = TPS65910_INT_MSK, - .ack_base = TPS65910_INT_MSK, + .ack_base = TPS65910_INT_STS, }; static struct regmap_irq_chip tps65910_irq_chip = { @@ -222,7 +222,7 @@ static struct regmap_irq_chip tps65910_irq_chip = { .irq_reg_stride = 2, .status_base = TPS65910_INT_STS, .mask_base = TPS65910_INT_MSK, - .ack_base = TPS65910_INT_MSK, + .ack_base = TPS65910_INT_STS, }; static int tps65910_irq_init(struct tps65910 *tps65910, int irq,