13 files changed, 46 insertions, 38 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 7edcf3238620..99c051490eff 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -437,6 +437,8 @@ config STX104
 config TI_ADC081C
         tristate "Texas Instruments ADC081C/ADC101C/ADC121C family"
         depends on I2C
+        select IIO_BUFFER
+        select IIO_TRIGGERED_BUFFER
         help
           If you say yes here you get support for Texas Instruments ADC081C,
           ADC101C and ADC121C ADC chips.
diff --git a/drivers/iio/chemical/atlas-ph-sensor.c b/drivers/iio/chemical/atlas-ph-sensor.c
index bd321b305a0a..ef761a508630 100644
--- a/drivers/iio/chemical/atlas-ph-sensor.c
+++ b/drivers/iio/chemical/atlas-ph-sensor.c
@@ -213,13 +213,14 @@ static int atlas_check_ec_calibration(struct atlas_data *data)
         struct device *dev = &data->client->dev;
         int ret;
         unsigned int val;
+        __be16  rval;
 
-        ret = regmap_bulk_read(data->regmap, ATLAS_REG_EC_PROBE, &val, 2);
+        ret = regmap_bulk_read(data->regmap, ATLAS_REG_EC_PROBE, &rval, 2);
         if (ret)
                 return ret;
 
-        dev_info(dev, "probe set to K = %d.%.2d", be16_to_cpu(val) / 100,
-                                                 be16_to_cpu(val) % 100);
+        val = be16_to_cpu(rval);
+        dev_info(dev, "probe set to K = %d.%.2d", val / 100, val % 100);
 
         ret = regmap_read(data->regmap, ATLAS_REG_EC_CALIB_STATUS, &val);
         if (ret)
diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
index 39dd2026ccc9..066161a4bccd 100644
--- a/drivers/iio/temperature/maxim_thermocouple.c
+++ b/drivers/iio/temperature/maxim_thermocouple.c
@@ -123,22 +123,24 @@ static int maxim_thermocouple_read(struct maxim_thermocouple_data *data,
 {
         unsigned int storage_bytes = data->chip->read_size;
         unsigned int shift = chan->scan_type.shift + (chan->address * 8);
-        unsigned int buf;
+        __be16 buf16;
+        __be32 buf32;
         int ret;
 
-        ret = spi_read(data->spi, (void *) &buf, storage_bytes);
-        if (ret)
-                return ret;
-
         switch (storage_bytes) {
         case 2:
-                *val = be16_to_cpu(buf);
+                ret = spi_read(data->spi, (void *)&buf16, storage_bytes);
+                *val = be16_to_cpu(buf16);
                 break;
         case 4:
-                *val = be32_to_cpu(buf);
+                ret = spi_read(data->spi, (void *)&buf32, storage_bytes);
+                *val = be32_to_cpu(buf32);
                 break;
         }
 
+        if (ret)
+                return ret;
+
         /* check to be sure this is a valid reading */
         if (*val & data->chip->status_bit)
                 return -EINVAL;
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 396ded52ab70..209a8f7ef02b 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1187,8 +1187,10 @@ int ion_query_heaps(struct ion_client *client, struct ion_heap_query *query)
                 hdata.type = heap->type;
                 hdata.heap_id = heap->id;
 
-                ret = copy_to_user(&buffer[cnt],
-                                   &hdata, sizeof(hdata));
+                if (copy_to_user(&buffer[cnt], &hdata, sizeof(hdata))) {
+                        ret = -EFAULT;
+                        goto out;
+                }
 
                 cnt++;
                 if (cnt >= max_cnt)
diff --git a/drivers/staging/android/ion/ion_of.c b/drivers/staging/android/ion/ion_of.c
index 15bac92b7f04..46b2bb99bfd6 100644
--- a/drivers/staging/android/ion/ion_of.c
+++ b/drivers/staging/android/ion/ion_of.c
@@ -107,7 +107,7 @@ struct ion_platform_data *ion_parse_dt(struct platform_device *pdev,
 
                 heap_pdev = of_platform_device_create(node, heaps[i].name,
                                                       &pdev->dev);
-                if (!pdev)
+                if (!heap_pdev)
                         return ERR_PTR(-ENOMEM);
                 heap_pdev->dev.platform_data = &heaps[i];
 
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index e36ee984485b..34307ac3f255 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -128,6 +128,7 @@ int arche_platform_change_state(enum arche_platform_state state,
         pdev = of_find_device_by_node(np);
         if (!pdev) {
                 pr_err("arche-platform device not found\n");
+                of_node_put(np);
                 return -ENODEV;
         }
 
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 071bb1cfd3ae..baab460eeaa3 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -1548,7 +1548,8 @@ static int ap_probe(struct usb_interface *interface,
         INIT_LIST_HEAD(&es2->arpcs);
         spin_lock_init(&es2->arpc_lock);
 
-        if (es2_arpc_in_enable(es2))
+        retval = es2_arpc_in_enable(es2);
+        if (retval)
                 goto error;
 
         retval = gb_hd_add(hd);
diff --git a/drivers/staging/greybus/gpio.c b/drivers/staging/greybus/gpio.c
index 5e06e4229e42..250caa00de5e 100644
--- a/drivers/staging/greybus/gpio.c
+++ b/drivers/staging/greybus/gpio.c
@@ -702,15 +702,13 @@ static int gb_gpio_probe(struct gbphy_device *gbphy_dev,
         ret = gb_gpio_irqchip_add(gpio, irqc, 0,
                                    handle_level_irq, IRQ_TYPE_NONE);
         if (ret) {
-                dev_err(&connection->bundle->dev,
-                        "failed to add irq chip: %d\n", ret);
+                dev_err(&gbphy_dev->dev, "failed to add irq chip: %d\n", ret);
                 goto exit_line_free;
         }
 
         ret = gpiochip_add(gpio);
         if (ret) {
-                dev_err(&connection->bundle->dev,
-                        "failed to add gpio chip: %d\n", ret);
+                dev_err(&gbphy_dev->dev, "failed to add gpio chip: %d\n", ret);
                 goto exit_gpio_irqchip_remove;
         }
 
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index 69f67ddbd4a3..660b4674a76f 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -127,7 +127,7 @@ struct gb_module *gb_module_create(struct gb_host_device *hd, u8 module_id,
         return module;
 
 err_put_interfaces:
-        for (--i; i > 0; --i)
+        for (--i; i >= 0; --i)
                 gb_interface_put(module->interfaces[i]);
 
         put_device(&module->dev);
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index 5ee7954bd9f9..2633d2bfb1b4 100644
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -888,7 +888,7 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev,
         minor = alloc_minor(gb_tty);
         if (minor < 0) {
                 if (minor == -ENOSPC) {
-                        dev_err(&connection->bundle->dev,
+                        dev_err(&gbphy_dev->dev,
                                 "no more free minor numbers\n");
                         retval = -ENODEV;
                 } else {
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index d626125d7af9..564b36d4f648 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -468,6 +468,8 @@ static inline int __sca3000_get_base_freq(struct sca3000_state *st,
         case SCA3000_MEAS_MODE_OP_2:
                 *base_freq = info->option_mode_2_freq;
                 break;
+        default:
+                ret = -EINVAL;
         }
 error_ret:
         return ret;
diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index 6eae60595905..23fda9d98bff 100644
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -871,12 +871,10 @@ static ssize_t xattr_cache_store(struct kobject *kobj,
 }
 LUSTRE_RW_ATTR(xattr_cache);
 
-static ssize_t unstable_stats_show(struct kobject *kobj,
-                                   struct attribute *attr,
-                                   char *buf)
+static int ll_unstable_stats_seq_show(struct seq_file *m, void *v)
 {
-        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
-                                              ll_kobj);
+        struct super_block     *sb    = m->private;
+        struct ll_sb_info      *sbi   = ll_s2sbi(sb);
         struct cl_client_cache *cache = sbi->ll_cache;
         long pages;
         int mb;
@@ -884,19 +882,21 @@ static ssize_t unstable_stats_show(struct kobject *kobj,
         pages = atomic_long_read(&cache->ccc_unstable_nr);
         mb = (pages * PAGE_SIZE) >> 20;
 
-        return sprintf(buf, "unstable_check:     %8d\n"
-                            "unstable_pages: %12ld\n"
-                            "unstable_mb:        %8d\n",
-                            cache->ccc_unstable_check, pages, mb);
+        seq_printf(m,
+                   "unstable_check:     %8d\n"
+                   "unstable_pages: %12ld\n"
+                   "unstable_mb:        %8d\n",
+                   cache->ccc_unstable_check, pages, mb);
+
+        return 0;
 }
 
-static ssize_t unstable_stats_store(struct kobject *kobj,
-                                    struct attribute *attr,
-                                    const char *buffer,
-                                    size_t count)
+static ssize_t ll_unstable_stats_seq_write(struct file *file,
+                                           const char __user *buffer,
+                                           size_t count, loff_t *off)
 {
-        struct ll_sb_info *sbi = container_of(kobj, struct ll_sb_info,
-                                              ll_kobj);
+        struct super_block *sb = ((struct seq_file *)file->private_data)->private;
+        struct ll_sb_info *sbi = ll_s2sbi(sb);
         char kernbuf[128];
         int val, rc;
 
@@ -922,7 +922,7 @@ static ssize_t unstable_stats_store(struct kobject *kobj,
 
         return count;
 }
-LUSTRE_RW_ATTR(unstable_stats);
+LPROC_SEQ_FOPS(ll_unstable_stats);
 
 static ssize_t root_squash_show(struct kobject *kobj, struct attribute *attr,
                                 char *buf)
@@ -995,6 +995,7 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
         /* { "filegroups",   lprocfs_rd_filegroups,  0, 0 }, */
         { "max_cached_mb",    &ll_max_cached_mb_fops, NULL },
         { "statahead_stats",  &ll_statahead_stats_fops, NULL, 0 },
+        { "unstable_stats",   &ll_unstable_stats_fops, NULL },
         { "sbi_flags",        &ll_sbi_flags_fops, NULL, 0 },
         { .name =               "nosquash_nids",
           .fops =               &ll_nosquash_nids_fops          },
@@ -1026,7 +1027,6 @@ static struct attribute *llite_attrs[] = {
         &lustre_attr_max_easize.attr,
         &lustre_attr_default_easize.attr,
         &lustre_attr_xattr_cache.attr,
-        &lustre_attr_unstable_stats.attr,
         &lustre_attr_root_squash.attr,
         NULL,
 };
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 78f5613e9467..6ab7443eabde 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3388,7 +3388,6 @@ int wilc_init(struct net_device *dev, struct host_if_drv **hif_drv_handler)
 
         clients_count++;
 
-        destroy_workqueue(hif_workqueue);
 _fail_:
         return result;
 }