diff options
Diffstat (limited to 'drivers/media/video/saa5249.c')
-rw-r--r-- | drivers/media/video/saa5249.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index c784715a0b04..8517aa4f0681 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -319,8 +319,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file, | |||
319 | unsigned int cmd, void *arg) | 319 | unsigned int cmd, void *arg) |
320 | { | 320 | { |
321 | static int virtual_mode = false; | 321 | static int virtual_mode = false; |
322 | struct video_device *vd = video_devdata(file); | 322 | struct saa5249_device *t = video_drvdata(file); |
323 | struct saa5249_device *t = video_get_drvdata(vd); | ||
324 | 323 | ||
325 | switch(cmd) | 324 | switch(cmd) |
326 | { | 325 | { |
@@ -618,8 +617,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd) | |||
618 | static int saa5249_ioctl(struct inode *inode, struct file *file, | 617 | static int saa5249_ioctl(struct inode *inode, struct file *file, |
619 | unsigned int cmd, unsigned long arg) | 618 | unsigned int cmd, unsigned long arg) |
620 | { | 619 | { |
621 | struct video_device *vd = video_devdata(file); | 620 | struct saa5249_device *t = video_drvdata(file); |
622 | struct saa5249_device *t = video_get_drvdata(vd); | ||
623 | int err; | 621 | int err; |
624 | 622 | ||
625 | cmd = vtx_fix_command(cmd); | 623 | cmd = vtx_fix_command(cmd); |
@@ -631,8 +629,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file, | |||
631 | 629 | ||
632 | static int saa5249_open(struct inode *inode, struct file *file) | 630 | static int saa5249_open(struct inode *inode, struct file *file) |
633 | { | 631 | { |
634 | struct video_device *vd = video_devdata(file); | 632 | struct saa5249_device *t = video_drvdata(file); |
635 | struct saa5249_device *t = video_get_drvdata(vd); | ||
636 | int pgbuf; | 633 | int pgbuf; |
637 | 634 | ||
638 | if (t->client == NULL) | 635 | if (t->client == NULL) |
@@ -669,8 +666,7 @@ static int saa5249_open(struct inode *inode, struct file *file) | |||
669 | 666 | ||
670 | static int saa5249_release(struct inode *inode, struct file *file) | 667 | static int saa5249_release(struct inode *inode, struct file *file) |
671 | { | 668 | { |
672 | struct video_device *vd = video_devdata(file); | 669 | struct saa5249_device *t = video_drvdata(file); |
673 | struct saa5249_device *t = video_get_drvdata(vd); | ||
674 | 670 | ||
675 | i2c_senddata(t, 1, 0x20, -1); /* Turn off CCT */ | 671 | i2c_senddata(t, 1, 0x20, -1); /* Turn off CCT */ |
676 | i2c_senddata(t, 5, 3, 3, -1); /* Turn off TV-display */ | 672 | i2c_senddata(t, 5, 3, 3, -1); /* Turn off TV-display */ |