aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-16 09:40:29 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-29 17:26:53 -0300
commit1182bdab0a2775c49e22279c48132e0b66f1f8b1 (patch)
treeddd3ae407cd5f442cd12e9fe8a949f4097905ea2
parenta50d06389fdfd805ee88efd78d90c82fe94fabda (diff)
sound/usb/media: use core routine to initialize media_device
The media core has now a routine to initialize media_device for USB devices. Use it, instead of doing its own logic, as it warrants that all USB drivers will behave the same. It also warrants that the device will get the same data, no matter if it was initialized initially via snd-usb-audio or via some other driver, like au0828. Takashi Iwai informally acked with this patch. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--sound/usb/media.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/sound/usb/media.c b/sound/usb/media.c
index 93a50d01490c..44a5de91f748 100644
--- a/sound/usb/media.c
+++ b/sound/usb/media.c
@@ -263,19 +263,11 @@ int media_snd_device_create(struct snd_usb_audio *chip,
mdev = media_device_get_devres(&usbdev->dev);
if (!mdev)
return -ENOMEM;
- if (!mdev->dev) {
- /* register media device */
- mdev->dev = &usbdev->dev;
- if (usbdev->product)
- strlcpy(mdev->model, usbdev->product,
- sizeof(mdev->model));
- if (usbdev->serial)
- strlcpy(mdev->serial, usbdev->serial,
- sizeof(mdev->serial));
- strcpy(mdev->bus_info, usbdev->devpath);
- mdev->hw_revision = le16_to_cpu(usbdev->descriptor.bcdDevice);
- media_device_init(mdev);
- }
+
+ /* Initialize media device */
+ if (!mdev->dev)
+ media_device_usb_init(mdev, usbdev, NULL);
+
if (!media_devnode_is_registered(&mdev->devnode)) {
ret = media_device_register(mdev);
if (ret) {

Privacy Policy