diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 6b2ab57538ee..a1f7e351f572 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c | |||
@@ -2247,24 +2247,25 @@ static int saa7134_g_parm(struct file *file, void *fh, | |||
2247 | 2247 | ||
2248 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 2248 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
2249 | static int vidioc_g_register (struct file *file, void *priv, | 2249 | static int vidioc_g_register (struct file *file, void *priv, |
2250 | struct v4l2_register *reg) | 2250 | struct v4l2_dbg_register *reg) |
2251 | { | 2251 | { |
2252 | struct saa7134_fh *fh = priv; | 2252 | struct saa7134_fh *fh = priv; |
2253 | struct saa7134_dev *dev = fh->dev; | 2253 | struct saa7134_dev *dev = fh->dev; |
2254 | 2254 | ||
2255 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 2255 | if (!v4l2_chip_match_host(®->match)) |
2256 | return -EINVAL; | 2256 | return -EINVAL; |
2257 | reg->val = saa_readb(reg->reg); | 2257 | reg->val = saa_readb(reg->reg); |
2258 | reg->size = 1; | ||
2258 | return 0; | 2259 | return 0; |
2259 | } | 2260 | } |
2260 | 2261 | ||
2261 | static int vidioc_s_register (struct file *file, void *priv, | 2262 | static int vidioc_s_register (struct file *file, void *priv, |
2262 | struct v4l2_register *reg) | 2263 | struct v4l2_dbg_register *reg) |
2263 | { | 2264 | { |
2264 | struct saa7134_fh *fh = priv; | 2265 | struct saa7134_fh *fh = priv; |
2265 | struct saa7134_dev *dev = fh->dev; | 2266 | struct saa7134_dev *dev = fh->dev; |
2266 | 2267 | ||
2267 | if (!v4l2_chip_match_host(reg->match_type, reg->match_chip)) | 2268 | if (!v4l2_chip_match_host(®->match)) |
2268 | return -EINVAL; | 2269 | return -EINVAL; |
2269 | saa_writeb(reg->reg&0xffffff, reg->val); | 2270 | saa_writeb(reg->reg&0xffffff, reg->val); |
2270 | return 0; | 2271 | return 0; |