Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / drivers / media / video / hdpvr / hdpvr-control.c

diff --git a/drivers/media/video/hdpvr/hdpvr-control.c b/drivers/media/video/hdpvr/hdpvr-control.c
index 5a6b78b..068df4b 100644 (file)
--- a/drivers/media/video/hdpvr/hdpvr-control.c
+++ b/drivers/media/video/hdpvr/hdpvr-control.c
@@ -29,8 +29,6 @@ int hdpvr_config_call(struct hdpvr_device *dev, uint value, u8 valbuf)
        int ret;
        char request_type = 0x38, snd_request = 0x01;
 
-       msleep(10);
-
        mutex_lock(&dev->usbc_mutex);
        dev->usbc_buf[0] = valbuf;
        ret = usb_control_msg(dev->udev,
@@ -170,8 +168,7 @@ int hdpvr_set_audio(struct hdpvr_device *dev, u8 input,
                if (ret == 2)
                        ret = 0;
        } else
-               ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE,
-                                       dev->options.audio_input+1);
+               ret = hdpvr_config_call(dev, CTRL_AUDIO_INPUT_VALUE, input);
 error:
        return ret;
 }