diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/i2c/other/tea575x-tuner.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c index 621d7fe3074b..c13a178383ba 100644 --- a/sound/i2c/other/tea575x-tuner.c +++ b/sound/i2c/other/tea575x-tuner.c | |||
@@ -87,8 +87,7 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea) | |||
87 | static int snd_tea575x_ioctl(struct inode *inode, struct file *file, | 87 | static int snd_tea575x_ioctl(struct inode *inode, struct file *file, |
88 | unsigned int cmd, unsigned long data) | 88 | unsigned int cmd, unsigned long data) |
89 | { | 89 | { |
90 | struct video_device *dev = video_devdata(file); | 90 | struct snd_tea575x *tea = video_drvdata(file); |
91 | struct snd_tea575x *tea = video_get_drvdata(dev); | ||
92 | void __user *arg = (void __user *)data; | 91 | void __user *arg = (void __user *)data; |
93 | 92 | ||
94 | switch(cmd) { | 93 | switch(cmd) { |
@@ -177,16 +176,14 @@ static void snd_tea575x_release(struct video_device *vfd) | |||
177 | 176 | ||
178 | static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file) | 177 | static int snd_tea575x_exclusive_open(struct inode *inode, struct file *file) |
179 | { | 178 | { |
180 | struct video_device *dev = video_devdata(file); | 179 | struct snd_tea575x *tea = video_drvdata(file); |
181 | struct snd_tea575x *tea = video_get_drvdata(dev); | ||
182 | 180 | ||
183 | return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0; | 181 | return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0; |
184 | } | 182 | } |
185 | 183 | ||
186 | static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file) | 184 | static int snd_tea575x_exclusive_release(struct inode *inode, struct file *file) |
187 | { | 185 | { |
188 | struct video_device *dev = video_devdata(file); | 186 | struct snd_tea575x *tea = video_drvdata(file); |
189 | struct snd_tea575x *tea = video_get_drvdata(dev); | ||
190 | 187 | ||
191 | clear_bit(0, &tea->in_use); | 188 | clear_bit(0, &tea->in_use); |
192 | return 0; | 189 | return 0; |