diff options
author | Josh Cartwright <joshc@codeaurora.org> | 2014-03-05 14:34:25 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-03-19 04:58:39 -0400 |
commit | 202f7680af1563516a057f884cea30be94d3014f (patch) | |
tree | 48822607e6876fecf20a6239ee0196d8e85e6f6d /drivers/mfd | |
parent | d9a335155c5840796e2a49a9009cc2c8bdb224b2 (diff) |
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.c | 3 |
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) | |||
394 | { | 394 | { |
395 | struct pm8921 *pmic; | 395 | struct pm8921 *pmic; |
396 | struct regmap *regmap; | 396 | struct regmap *regmap; |
397 | int rc; | 397 | int irq, rc; |
398 | unsigned int val; | 398 | unsigned int val; |
399 | unsigned int irq; | ||
400 | u32 rev; | 399 | u32 rev; |
401 | struct pm_irq_chip *chip; | 400 | struct pm_irq_chip *chip; |
402 | unsigned int nirqs = PM8921_NR_IRQS; | 401 | unsigned int nirqs = PM8921_NR_IRQS; |