summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJ Keerthy <j-keerthy@ti.com>2013-06-19 05:57:47 (GMT)
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-20 08:50:55 (GMT)
commitad522f4e351d020714959d9570baf3de7fcbad11 (patch)
treef90bbb8947915f8d0db372f9ae687e2eb8862255 /drivers
parent283aae8ab88e695a660c610d6535ca44bc5b8835 (diff)
downloadlinux-ad522f4e351d020714959d9570baf3de7fcbad11.tar.xz
mfd: palmas: Check if irq is valid
Check if irq value obtained is valid. If it is not valid then skip the irq request step and go ahead with the probe. Signed-off-by: J Keerthy <j-keerthy@ti.com> Reviewed-by: Mark Brown <broonie@linaro.org> Reviewed-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/palmas.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 62fa728..b24bee3 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -290,6 +290,11 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
}
}
+ if (!palmas->irq) {
+ dev_warn(palmas->dev, "IRQ missing: skipping irq request\n");
+ goto no_irq;
+ }
+
/* Change interrupt line output polarity */
if (pdata->irq_flags & IRQ_TYPE_LEVEL_HIGH)
reg = PALMAS_POLARITY_CTRL_INT_POLARITY;
@@ -316,6 +321,7 @@ static int palmas_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err;
+no_irq:
slave = PALMAS_BASE_TO_SLAVE(PALMAS_PU_PD_OD_BASE);
addr = PALMAS_BASE_TO_REG(PALMAS_PU_PD_OD_BASE,
PALMAS_PRIMARY_SECONDARY_PAD1);