aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa5249.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa5249.c')
-rw-r--r--drivers/media/video/saa5249.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 225117c789ca..c784715a0b04 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -186,7 +186,7 @@ static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
186 t->vdau[pgbuf].stopped = true; 186 t->vdau[pgbuf].stopped = true;
187 t->is_searching[pgbuf] = false; 187 t->is_searching[pgbuf] = false;
188 } 188 }
189 vd->priv=t; 189 video_set_drvdata(vd, t);
190 190
191 191
192 /* 192 /*
@@ -221,7 +221,7 @@ static int saa5249_detach(struct i2c_client *client)
221 struct video_device *vd = i2c_get_clientdata(client); 221 struct video_device *vd = i2c_get_clientdata(client);
222 i2c_detach_client(client); 222 i2c_detach_client(client);
223 video_unregister_device(vd); 223 video_unregister_device(vd);
224 kfree(vd->priv); 224 kfree(video_get_drvdata(vd));
225 kfree(vd); 225 kfree(vd);
226 kfree(client); 226 kfree(client);
227 return 0; 227 return 0;
@@ -320,7 +320,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
320{ 320{
321 static int virtual_mode = false; 321 static int virtual_mode = false;
322 struct video_device *vd = video_devdata(file); 322 struct video_device *vd = video_devdata(file);
323 struct saa5249_device *t=vd->priv; 323 struct saa5249_device *t = video_get_drvdata(vd);
324 324
325 switch(cmd) 325 switch(cmd)
326 { 326 {
@@ -619,7 +619,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
619 unsigned int cmd, unsigned long arg) 619 unsigned int cmd, unsigned long arg)
620{ 620{
621 struct video_device *vd = video_devdata(file); 621 struct video_device *vd = video_devdata(file);
622 struct saa5249_device *t=vd->priv; 622 struct saa5249_device *t = video_get_drvdata(vd);
623 int err; 623 int err;
624 624
625 cmd = vtx_fix_command(cmd); 625 cmd = vtx_fix_command(cmd);
@@ -632,7 +632,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file,
632static int saa5249_open(struct inode *inode, struct file *file) 632static int saa5249_open(struct inode *inode, struct file *file)
633{ 633{
634 struct video_device *vd = video_devdata(file); 634 struct video_device *vd = video_devdata(file);
635 struct saa5249_device *t = vd->priv; 635 struct saa5249_device *t = video_get_drvdata(vd);
636 int pgbuf; 636 int pgbuf;
637 637
638 if (t->client == NULL) 638 if (t->client == NULL)
@@ -670,7 +670,7 @@ static int saa5249_open(struct inode *inode, struct file *file)
670static int saa5249_release(struct inode *inode, struct file *file) 670static int saa5249_release(struct inode *inode, struct file *file)
671{ 671{
672 struct video_device *vd = video_devdata(file); 672 struct video_device *vd = video_devdata(file);
673 struct saa5249_device *t = vd->priv; 673 struct saa5249_device *t = video_get_drvdata(vd);
674 674
675 i2c_senddata(t, 1, 0x20, -1); /* Turn off CCT */ 675 i2c_senddata(t, 1, 0x20, -1); /* Turn off CCT */
676 i2c_senddata(t, 5, 3, 3, -1); /* Turn off TV-display */ 676 i2c_senddata(t, 5, 3, 3, -1); /* Turn off TV-display */