lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (13069): radio-mr800: ensure the radio is initialized to a consistent state

Browse Source 
Ensure the radio is initialized to a consistent state.

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 18:13:50 -03:00
committed by Mauro Carvalho Chehab
parent 8a7cd16f1f
commit 502d50166c
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,9 @@ MODULE_LICENSE("GPL");
#define amradio_dev_warn(dev, fmt, arg...) \ #define amradio_dev_warn(dev, fmt, arg...) \
dev_warn(dev, MR800_DRIVER_NAME " - " fmt, ##arg) dev_warn(dev, MR800_DRIVER_NAME " - " fmt, ##arg)
#define amradio_dev_err(dev, fmt, arg...) \
dev_err(dev, MR800_DRIVER_NAME " - " fmt, ##arg)
/* Probably USB_TIMEOUT should be modified in module parameter */ /* Probably USB_TIMEOUT should be modified in module parameter */
#define BUFFER_LENGTH 8 #define BUFFER_LENGTH 8
#define USB_TIMEOUT 500 #define USB_TIMEOUT 500
@@ -137,6 +140,7 @@ struct amradio_device {
int curfreq; int curfreq;
int stereo; int stereo;
int muted; int muted;
int initialized;
}; };
#define vdev_to_amradio(r) container_of(r, struct amradio_device, videodev) #define vdev_to_amradio(r) container_of(r, struct amradio_device, videodev)
@@ -478,6 +482,31 @@ static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
return 0; return 0;
} }
static int usb_amradio_init(struct amradio_device *radio)
{
int retval;
retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev, "amradio_stop failed\n");
goto out_err;
}
retval = amradio_set_stereo(radio, WANT_STEREO);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");
goto out_err;
}
radio->initialized = 1;
goto out;
out_err:
amradio_dev_err(&radio->videodev.dev, "initialization failed\n");
out:
return retval;
}
/* open device - amradio_start() and amradio_setfreq() */ /* open device - amradio_start() and amradio_setfreq() */
static int usb_amradio_open(struct file *file) static int usb_amradio_open(struct file *file)
{ {
@@ -493,6 +522,9 @@ static int usb_amradio_open(struct file *file)
file->private_data = radio; file->private_data = radio;
if (unlikely(!radio->initialized))
retval = usb_amradio_init(radio);
unlock: unlock:
mutex_unlock(&radio->lock); mutex_unlock(&radio->lock);
return retval; return retval;
@@ -641,8 +673,6 @@ static int usb_amradio_probe(struct usb_interface *intf,
radio->usbdev = interface_to_usbdev(intf); radio->usbdev = interface_to_usbdev(intf);
radio->curfreq = 95.16 * FREQ_MUL; radio->curfreq = 95.16 * FREQ_MUL;
radio->stereo = -1;
radio->muted = 1;
mutex_init(&radio->lock); mutex_init(&radio->lock);