8 files changed, 29 insertions, 23 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f68cefa11e2..fa0e8da55f18 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5034,7 +5034,6 @@ F:	lib/fault-inject.c
 
 FBTFT Framebuffer drivers
 M:      Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-M:      Noralf Trønnes <noralf@tronnes.org>
 S:      Maintained
 F:      drivers/staging/fbtft/
 
diff --git a/drivers/iio/adc/rcar-gyroadc.c b/drivers/iio/adc/rcar-gyroadc.c
index 0c44f72c32a8..018ed360e717 100644
--- a/drivers/iio/adc/rcar-gyroadc.c
+++ b/drivers/iio/adc/rcar-gyroadc.c
@@ -336,7 +336,7 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)
         struct device_node *child;
         struct regulator *vref;
         unsigned int reg;
-        unsigned int adcmode, childmode;
+        unsigned int adcmode = -1, childmode;
         unsigned int sample_width;
         unsigned int num_channels;
         int ret, first = 1;
@@ -366,6 +366,8 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)
                         channels = rcar_gyroadc_iio_channels_3;
                         num_channels = ARRAY_SIZE(rcar_gyroadc_iio_channels_3);
                         break;
+                default:
+                        return -EINVAL;
                 }
 
                 /*
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 0a6beb3d99cb..56cf5907a5f0 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1208,7 +1208,7 @@ static int xadc_probe(struct platform_device *pdev)
 
         ret = xadc->ops->setup(pdev, indio_dev, irq);
         if (ret)
-                goto err_free_samplerate_trigger;
+                goto err_clk_disable_unprepare;
 
         ret = request_irq(irq, xadc->ops->interrupt_handler, 0,
                         dev_name(&pdev->dev), indio_dev);
@@ -1268,6 +1268,8 @@ static int xadc_probe(struct platform_device *pdev)
 
 err_free_irq:
         free_irq(irq, indio_dev);
+err_clk_disable_unprepare:
+        clk_disable_unprepare(xadc->clk);
 err_free_samplerate_trigger:
         if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
                 iio_trigger_free(xadc->samplerate_trigger);
@@ -1277,8 +1279,6 @@ err_free_convst_trigger:
 err_triggered_buffer_cleanup:
         if (xadc->ops->flags & XADC_FLAGS_BUFFERED)
                 iio_triggered_buffer_cleanup(indio_dev);
-err_clk_disable_unprepare:
-        clk_disable_unprepare(xadc->clk);
 err_device_free:
         kfree(indio_dev->channels);
 
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index a5913e97945e..f9b8fc9ae13f 100644
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -76,7 +76,7 @@ static int quad8_read_raw(struct iio_dev *indio_dev,
                         return IIO_VAL_INT;
                 }
 
-                flags = inb(base_offset);
+                flags = inb(base_offset + 1);
                 borrow = flags & BIT(0);
                 carry = !!(flags & BIT(1));
 
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
index 47acb0a29842..3be5f25ff113 100644
--- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c
@@ -588,8 +588,7 @@ static int parse_mc_ranges(struct device *dev,
                            int *paddr_cells,
                            int *mc_addr_cells,
                            int *mc_size_cells,
-                           const __be32 **ranges_start,
-                           u8 *num_ranges)
+                           const __be32 **ranges_start)
 {
         const __be32 *prop;
         int range_tuple_cell_count;
@@ -602,8 +601,6 @@ static int parse_mc_ranges(struct device *dev,
                 dev_warn(dev,
                          "missing or empty ranges property for device tree node '%s'\n",
                          mc_node->name);
-
-                *num_ranges = 0;
                 return 0;
         }
 
@@ -630,8 +627,7 @@ static int parse_mc_ranges(struct device *dev,
                 return -EINVAL;
         }
 
-        *num_ranges = ranges_len / tuple_len;
-        return 0;
+        return ranges_len / tuple_len;
 }
 
 static int get_mc_addr_translation_ranges(struct device *dev,
@@ -639,7 +635,7 @@ static int get_mc_addr_translation_ranges(struct device *dev,
                                                 **ranges,
                                           u8 *num_ranges)
 {
-        int error;
+        int ret;
         int paddr_cells;
         int mc_addr_cells;
         int mc_size_cells;
@@ -647,16 +643,16 @@ static int get_mc_addr_translation_ranges(struct device *dev,
         const __be32 *ranges_start;
         const __be32 *cell;
 
-        error = parse_mc_ranges(dev,
+        ret = parse_mc_ranges(dev,
                                 &paddr_cells,
                                 &mc_addr_cells,
                                 &mc_size_cells,
-                                &ranges_start,
-                                num_ranges);
-        if (error < 0)
-                return error;
+                                &ranges_start);
+        if (ret < 0)
+                return ret;
 
-        if (!(*num_ranges)) {
+        *num_ranges = ret;
+        if (!ret) {
                 /*
                  * Missing or empty ranges property ("ranges;") for the
                  * 'fsl,qoriq-mc' node. In this case, identity mapping
diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index 92cd4113cf75..87fe366f8f70 100644
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -255,7 +255,7 @@ srpc_service_init(struct srpc_service *svc)
         svc->sv_shuttingdown = 0;
 
         svc->sv_cpt_data = cfs_percpt_alloc(lnet_cpt_table(),
-                                            sizeof(*svc->sv_cpt_data));
+                                            sizeof(**svc->sv_cpt_data));
         if (!svc->sv_cpt_data)
                 return -ENOMEM;
 
diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
index f0639ee6c8b9..fdfb6a620a43 100644
--- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
+++ b/drivers/staging/media/platform/bcm2835/mmal-vchiq.c
@@ -397,8 +397,10 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
 
         /* get context */
         msg_context = get_msg_context(instance);
-        if (msg_context == NULL)
-                return -ENOMEM;
+        if (!msg_context) {
+                ret = -ENOMEM;
+                goto unlock;
+        }
 
         /* store bulk message context for when data arrives */
         msg_context->u.bulk.instance = instance;
@@ -454,6 +456,7 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
 
         vchi_service_release(instance->handle);
 
+unlock:
         mutex_unlock(&instance->bulk_mutex);
 
         return ret;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index e6241fb5cfa6..3aeffcb9c87e 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -121,8 +121,14 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state)
         if (err < 0)
                 return err;
 
-        (void)of_property_read_u32(dev->of_node, "cache-line-size",
+        err = of_property_read_u32(dev->of_node, "cache-line-size",
                                    &g_cache_line_size);
+
+        if (err) {
+                dev_err(dev, "Missing cache-line-size property\n");
+                return -ENODEV;
+        }
+
         g_fragments_size = 2 * g_cache_line_size;
 
         /* Allocate space for the channels in coherent memory */