summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJosh Cartwright <joshc@codeaurora.org>2014-03-05 13:34:25 -0600
committerLee Jones <lee.jones@linaro.org>2014-03-19 08:58:39 +0000
commit202f7680af1563516a057f884cea30be94d3014f (patch)
tree48822607e6876fecf20a6239ee0196d8e85e6f6d /drivers/mfd
parentd9a335155c5840796e2a49a9009cc2c8bdb224b2 (diff)
downloadlinux-202f7680af1563516a057f884cea30be94d3014f.tar.bz2
mfd: pm8921: Fixup probe() error path when irq invalid
platform_get_irq() returns a negative error code when an IRQ is invalid or unspecified. Make 'irq' signed to properly handle this. Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Josh Cartwright <joshc@codeaurora.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/pm8921-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 1153e8a3a556..b97a97187ae9 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -394,9 +394,8 @@ static int pm8921_probe(struct platform_device *pdev)
{
struct pm8921 *pmic;
struct regmap *regmap;
- int rc;
+ int irq, rc;
unsigned int val;
- unsigned int irq;
u32 rev;
struct pm_irq_chip *chip;
unsigned int nirqs = PM8921_NR_IRQS;