iio: sx9310: Fix irq handling

Fixes enable/disable irq handling at various points. The driver needs to
only enable/disable irqs if there is an actual irq handler installed.

Signed-off-by: Daniel Campello <campello@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index c02a9e8b7a7a9f7fe8f079d3efddb25ee46fc8f8..4ad8194c70a906c3f821b884ed8a71ae0f3a87b2 100644 (file)
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -323,11 +323,15 @@ static int sx9310_put_event_channel(struct sx9310_data *data, int channel)
 
 static int sx9310_enable_irq(struct sx9310_data *data, unsigned int irq)
 {
+       if (!data->client->irq)
+               return 0;
        return regmap_update_bits(data->regmap, SX9310_REG_IRQ_MSK, irq, irq);
 }
 
 static int sx9310_disable_irq(struct sx9310_data *data, unsigned int irq)
 {
+       if (!data->client->irq)
+               return 0;
        return regmap_update_bits(data->regmap, SX9310_REG_IRQ_MSK, irq, 0);
 }
 
@@ -381,7 +385,7 @@ static int sx9310_read_proximity(struct sx9310_data *data,
 
        mutex_unlock(&data->mutex);
 
-       if (data->client->irq > 0) {
+       if (data->client->irq) {
                ret = wait_for_completion_interruptible(&data->completion);
                reinit_completion(&data->completion);
        } else {
@@ -1007,10 +1011,11 @@ static int __maybe_unused sx9310_resume(struct device *dev)
 
 out:
        mutex_unlock(&data->mutex);
+       if (ret)
+               return ret;
 
        enable_irq(data->client->irq);
-
-       return ret;
+       return 0;
 }
 
 static const struct dev_pm_ops sx9310_pm_ops = {