Merge /home/v4l/v4l/for_upstream

[karo-tx-linux.git] / drivers / media / parport / pms.c

diff --git a/drivers/media/parport/pms.c b/drivers/media/parport/pms.c
index 77f9c92186f4f4da362152a1716a75f0751a84dc..66c957a02ba7bfbfed0cf8a3939808de56f3ff88 100644 (file)
--- a/drivers/media/parport/pms.c
+++ b/drivers/media/parport/pms.c
@@ -735,12 +735,12 @@ static int pms_g_std(struct file *file, void *fh, v4l2_std_id *std)
        return 0;
 }
 
-static int pms_s_std(struct file *file, void *fh, v4l2_std_id *std)
+static int pms_s_std(struct file *file, void *fh, v4l2_std_id std)
 {
        struct pms *dev = video_drvdata(file);
        int ret = 0;
 
-       dev->std = *std;
+       dev->std = std;
        if (dev->std & V4L2_STD_NTSC) {
                pms_framerate(dev, 30);
                pms_secamcross(dev, 0);