Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / drivers / iio / proximity / as3935.c

diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index e2f926cdcad2acdbdd8aec50f0f479f52d2a6584..2e3a70e1b24541677d80661d9dedb7742d1f3341 100644 (file)
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -231,10 +231,16 @@ static void as3935_event_work(struct work_struct *work)
 {
        struct as3935_state *st;
        int val;
+       int ret;
 
        st = container_of(work, struct as3935_state, work.work);
 
-       as3935_read(st, AS3935_INT, &val);
+       ret = as3935_read(st, AS3935_INT, &val);
+       if (ret) {
+               dev_warn(&st->spi->dev, "read error\n");
+               return;
+       }
+
        val &= AS3935_INT_MASK;
 
        switch (val) {
@@ -242,7 +248,7 @@ static void as3935_event_work(struct work_struct *work)
                iio_trigger_poll(st->trig);
                break;
        case AS3935_NOISE_INT:
-               dev_warn(&st->spi->dev, "noise level is too high");
+               dev_warn(&st->spi->dev, "noise level is too high\n");
                break;
        }
 }
@@ -346,7 +352,6 @@ static int as3935_probe(struct spi_device *spi)
 
        st = iio_priv(indio_dev);
        st->spi = spi;
-       st->tune_cap = 0;
 
        spi_set_drvdata(spi, indio_dev);
        mutex_init(&st->lock);
@@ -468,4 +473,3 @@ module_spi_driver(as3935_driver);
 MODULE_AUTHOR("Matt Ranostay <mranostay@gmail.com>");
 MODULE_DESCRIPTION("AS3935 lightning sensor");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("spi:as3935");