]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: am437x: fix sparse warnings
authorPrabhakar Lad <prabhakar.csengg@gmail.com>
Mon, 26 Jan 2015 14:50:15 +0000 (11:50 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Feb 2015 12:59:34 +0000 (10:59 -0200)
This patch fixes following spare warnings:

drivers/media/platform/am437x/am437x-vpfe.c:66:28: warning: symbol 'vpfe_standards' was not declared. Should it be static?
drivers/media/platform/am437x/am437x-vpfe.c:2202:57: warning: incorrect type in argument 2 (different address spaces)
drivers/media/platform/am437x/am437x-vpfe.c:2202:57:    expected void [noderef] <asn:1>*params
drivers/media/platform/am437x/am437x-vpfe.c:2202:57:    got void *param
include/linux/spinlock.h:364:9: warning: context imbalance in 'vpfe_start_streaming' - unexpected unlock

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/am437x/am437x-vpfe.c

index e01ac22d624491b6baec2fe2d404ae4db7e11cd3..349bd060f5a4609fac2ac38a26f204048702c248 100644 (file)
@@ -63,7 +63,7 @@ struct vpfe_standard {
        int frame_format;
 };
 
-const struct vpfe_standard vpfe_standards[] = {
+static const struct vpfe_standard vpfe_standards[] = {
        {V4L2_STD_525_60, 720, 480, {11, 10}, 1},
        {V4L2_STD_625_50, 720, 576, {54, 59}, 1},
 };
@@ -2024,7 +2024,6 @@ err:
                list_del(&buf->list);
                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
        }
-       spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags);
 
        return ret;
 }
@@ -2199,7 +2198,7 @@ static long vpfe_ioctl_default(struct file *file, void *priv,
 
        switch (cmd) {
        case VIDIOC_AM437X_CCDC_CFG:
-               ret = vpfe_ccdc_set_params(&vpfe->ccdc, param);
+               ret = vpfe_ccdc_set_params(&vpfe->ccdc, (void __user *)param);
                if (ret) {
                        vpfe_dbg(2, vpfe,
                                "Error setting parameters in CCDC\n");