Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / hwmon / max1111.c

diff --git a/kernel/drivers/hwmon/max1111.c b/kernel/drivers/hwmon/max1111.c
index f67d71e..303d0c9 100644 (file)
--- a/kernel/drivers/hwmon/max1111.c
+++ b/kernel/drivers/hwmon/max1111.c
@@ -85,6 +85,9 @@ static struct max1111_data *the_max1111;
 
 int max1111_read_channel(int channel)
 {
+       if (!the_max1111 || !the_max1111->spi)
+               return -ENODEV;
+
        return max1111_read(&the_max1111->spi->dev, channel);
 }
 EXPORT_SYMBOL(max1111_read_channel);
@@ -258,6 +261,9 @@ static int max1111_remove(struct spi_device *spi)
 {
        struct max1111_data *data = spi_get_drvdata(spi);
 
+#ifdef CONFIG_SHARPSL_PM
+       the_max1111 = NULL;
+#endif
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&spi->dev.kobj, &max1110_attr_group);
        sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
@@ -277,7 +283,6 @@ MODULE_DEVICE_TABLE(spi, max1111_ids);
 static struct spi_driver max1111_driver = {
        .driver         = {
                .name   = "max1111",
-               .owner  = THIS_MODULE,
        },
        .id_table       = max1111_ids,
        .probe          = max1111_probe,