dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

V4L/DVB (13066): radio-mr800: remove device removed indicator 

Remove device removed indicator

Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Acked-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
David Ellingsworth 2009-09-23 17:52:17 -03:00 committed by Mauro Carvalho Chehab
parent eac000a90e
commit 26452bfef4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/radio/radio-mr800.c
View File

@ -137,7 +137,6 @@ struct amradio_device {
int curfreq;
int stereo;
int users;
int removed;
int muted;
};
@ -270,7 +269,7 @@ static void usb_amradio_disconnect(struct usb_interface *intf)
struct amradio_device *radio = usb_get_intfdata(intf);
mutex_lock(&radio->lock);
radio->removed = 1;
radio->usbdev = NULL;
mutex_unlock(&radio->lock);
usb_set_intfdata(intf, NULL);
@ -488,7 +487,7 @@ static int usb_amradio_open(struct file *file)
mutex_lock(&radio->lock);
if (radio->removed) {
if (!radio->usbdev) {
retval = -EIO;
goto unlock;
}
@ -528,19 +527,17 @@ static int usb_amradio_close(struct file *file)
mutex_lock(&radio->lock);
if (radio->removed) {
if (!radio->usbdev) {
retval = -EIO;
goto unlock;
}
radio->users = 0;
if (!radio->removed) {
retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"amradio_stop failed\n");
}
retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"amradio_stop failed\n");
unlock:
mutex_unlock(&radio->lock);
@ -555,7 +552,7 @@ static long usb_amradio_ioctl(struct file *file, unsigned int cmd,
mutex_lock(&radio->lock);
if (radio->removed) {
if (!radio->usbdev) {
retval = -EIO;
goto unlock;
}
@ -673,7 +670,6 @@ static int usb_amradio_probe(struct usb_interface *intf,
radio->videodev.ioctl_ops = &usb_amradio_ioctl_ops;
radio->videodev.release = usb_amradio_video_device_release;
radio->removed = 0;
radio->users = 0;
radio->usbdev = interface_to_usbdev(intf);
radio->curfreq = 95.16 * FREQ_MUL;