Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / iio / meter / ade7754.c

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 8552c76cbbe76f998fbdde27388abba57edd868b..1e950685e12f94bf3ee1864b9ff1b60a39845271 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -438,7 +438,7 @@ static ssize_t ade7754_write_frequency(struct device *dev,
        ret = kstrtou16(buf, 10, &val);
        if (ret)
                return ret;
-       if (val == 0)
+       if (!val)
                return -EINVAL;
 
        mutex_lock(&indio_dev->mlock);
@@ -575,7 +575,6 @@ static int ade7754_remove(struct spi_device *spi)
 static struct spi_driver ade7754_driver = {
        .driver = {
                .name = "ade7754",
-               .owner = THIS_MODULE,
        },
        .probe = ade7754_probe,
        .remove = ade7754_remove,