summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2009-02-12 07:32:52 +0100
committerErik Andrén <erik.andren@gmail.com>2009-02-12 07:32:52 +0100
commit7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf (patch)
tree85b8e684f011c09e31b7d3626845731c6e596605 /linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
parentc2d3fb9ba38411d60945585f92142052c98856b5 (diff)
downloadmediapointer-dvb-s2-7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf.tar.gz
mediapointer-dvb-s2-7ca03eac2d8ff90a5ffc56ee23935a4daf31aabf.tar.bz2
gspca - m5602-s5k4aa: Fixup SXGA resolution.
From: Grégory Lardière <spmf2004-m560x@yahoo.fr> The SXGA resolution doesn't work unless you first force the VGA resolution. More investigation is needed in order to fix this the "right" way. Priority: normal Signed-off-by: Grégory Lardière <spmf2004-m560x@yahoo.fr> Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c')
-rw-r--r--linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index 97c06c5d0..48bf519c6 100644
--- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -66,27 +66,25 @@ static
};
static struct v4l2_pix_format s5k4aa_modes[] = {
-#if 0
{
- 1280,
- 1024,
+ 640,
+ 480,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
- 1280 * 1024,
- .bytesperline = 1280,
+ 640 * 480,
+ .bytesperline = 640,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
},
-#endif
{
- 640,
- 480,
+ 1280,
+ 1024,
V4L2_PIX_FMT_SBGGR8,
V4L2_FIELD_NONE,
.sizeimage =
- 640 * 480,
- .bytesperline = 640,
+ 1280 * 1024,
+ .bytesperline = 1280,
.colorspace = V4L2_COLORSPACE_SRGB,
.priv = 0
}
@@ -303,6 +301,10 @@ int s5k4aa_start(struct sd *sd)
return -EINVAL;
}
}
+ err = s5k4aa_set_noise(&sd->gspca_dev, 0);
+ if (err < 0)
+ return err;
+ break;
case 640:
PDEBUG(D_V4L2, "Configuring camera for VGA mode");
@@ -335,6 +337,10 @@ int s5k4aa_start(struct sd *sd)
return -EINVAL;
}
}
+ err = s5k4aa_set_noise(&sd->gspca_dev, 1);
+ if (err < 0)
+ return err;
+ break;
}
return err;
}
@@ -389,10 +395,6 @@ int s5k4aa_init(struct sd *sd)
if (err < 0)
return err;
- err = s5k4aa_set_noise(&sd->gspca_dev, sensor_settings[NOISE_SUPP_IDX]);
- if (err < 0)
- return err;
-
err = s5k4aa_set_vflip(&sd->gspca_dev, sensor_settings[VFLIP_IDX]);
if (err < 0)
return err;