summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/stk1160/stk1160-core.c
diff options
context:
space:
mode:
authorMarcel Hasler <mahasler@gmail.com>2016-12-15 20:17:26 -0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-02-03 11:25:51 -0200
commite36e6b5f26c14fd588d5c7e78527d3707f8ac836 (patch)
tree9c8422f72379195fe5bc0944f13d4eea02d6ed55 /drivers/media/usb/stk1160/stk1160-core.c
parent814e92b8cadf73ee79f689ec48f64408f3904d19 (diff)
downloadop-kernel-dev-e36e6b5f26c14fd588d5c7e78527d3707f8ac836.zip
op-kernel-dev-e36e6b5f26c14fd588d5c7e78527d3707f8ac836.tar.gz
[media] stk1160: Remove stk1160-mixer and setup internal AC97 codec automatically
Exposing all the channels of the device's internal AC97 codec to userspace is unnecessary and confusing. Instead the driver should setup the codec with proper values. This patch removes the mixer and sets up the codec using optimal values, i.e. the same values set by the Windows driver. This also makes the device work out-of-the-box, without the need for the user to reconfigure the device every time it's plugged in. Signed-off-by: Marcel Hasler <mahasler@gmail.com> Acked-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/stk1160/stk1160-core.c')
-rw-r--r--drivers/media/usb/stk1160/stk1160-core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c
index bc02947..f3c9b8a 100644
--- a/drivers/media/usb/stk1160/stk1160-core.c
+++ b/drivers/media/usb/stk1160/stk1160-core.c
@@ -373,7 +373,7 @@ static int stk1160_probe(struct usb_interface *interface,
/* select default input */
stk1160_select_input(dev);
- stk1160_ac97_register(dev);
+ stk1160_ac97_setup(dev);
rc = stk1160_video_register(dev);
if (rc < 0)
@@ -411,9 +411,6 @@ static void stk1160_disconnect(struct usb_interface *interface)
/* Here is the only place where isoc get released */
stk1160_uninit_isoc(dev);
- /* ac97 unregister needs to be done before usb_device is cleared */
- stk1160_ac97_unregister(dev);
-
stk1160_clear_queue(dev);
video_unregister_device(&dev->vdev);
OpenPOWER on IntegriCloud