From: Shuah Khan <shuahkh@osg.samsung.com> To: mchehab@osg.samsung.com, tiwai@suse.com, clemens@ladisch.de, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, javier@osg.samsung.com Cc: Shuah Khan <shuahkh@osg.samsung.com>, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, perex@perex.cz, arnd@arndb.de, dan.carpenter@oracle.com, tvboxspy@gmail.com, crope@iki.fi, ruchandani.tina@gmail.com, corbet@lwn.net, chehabrafael@gmail.com, k.kozlowski@samsung.com, stefanr@s5r6.in-berlin.de, inki.dae@samsung.com, jh1009.sung@samsung.com, elfring@users.sourceforge.net, prabhakar.csengg@gmail.com, sw0312.kim@samsung.com, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com, labbott@fedoraproject.org, pierre-louis.bossart@linux.intel.com, ricard.wanderlof@axis.com, julian@jusst.de, takamichiho@gmail.com, dominic.sacre@gmx.de, misterpib@gmail.com, daniel@zonque.org, gtmkramer@xs4all.nl, normalperson@yhbt.net, joe@oampo.co.uk, linuxbugs@vittgam.net, johan@oljud.se, klock.android@gmail.com, nenggun.kim@samsung.com, j.anaszewski@samsung.com, geliangtang@163.com, albert@huitsing.nl, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 15/22] media: au0828 handle media_init and media_register window Date: Thu, 11 Feb 2016 16:41:31 -0700 [thread overview] Message-ID: <31acd1abfe83e778ad6e9baa5494ca48a167d95a.1455233155.git.shuahkh@osg.samsung.com> (raw) In-Reply-To: <cover.1455233150.git.shuahkh@osg.samsung.com> In-Reply-To: <cover.1455233150.git.shuahkh@osg.samsung.com> Media device initialization and registration steps are split. There is a window between media device init and media device register during usb probe. au0828 bridge driver and snd-usb-audio could try to initialize the media device, if they simply checked, whether the device has been registered. They also need to check whether the device has been initialized. Change the au0828-core to check if media device is already initialized during initialization step and check if media device is already registered during the registration step. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- drivers/media/usb/au0828/au0828-core.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index a740bea..99f8022 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -228,7 +228,8 @@ static int au0828_media_device_init(struct au0828_dev *dev, if (!mdev) return -ENOMEM; - if (!media_devnode_is_registered(&mdev->devnode)) { + /* check if media device is already initialized */ + if (!mdev->dev) { mdev->dev = &udev->dev; if (udev->product) @@ -328,6 +329,27 @@ static int au0828_create_media_graph(struct au0828_dev *dev) return 0; } +static int au0828_media_device_register(struct au0828_dev *dev, + struct usb_device *udev) +{ +#ifdef CONFIG_MEDIA_CONTROLLER + int ret; + + if (dev->media_dev && + !media_devnode_is_registered(&dev->media_dev->devnode)) { + + /* register media device */ + ret = media_device_register(dev->media_dev); + if (ret) { + dev_err(&udev->dev, + "Media Device Register Error: %d\n", ret); + return ret; + } + } +#endif + return 0; +} + static int au0828_usb_probe(struct usb_interface *interface, const struct usb_device_id *id) { @@ -455,7 +477,7 @@ static int au0828_usb_probe(struct usb_interface *interface, } #ifdef CONFIG_MEDIA_CONTROLLER - retval = media_device_register(dev->media_dev); + retval = au0828_media_device_register(dev, usbdev); #endif done: -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Shuah Khan <shuahkh@osg.samsung.com> To: mchehab@osg.samsung.com, tiwai@suse.com, clemens@ladisch.de, hans.verkuil@cisco.com, laurent.pinchart@ideasonboard.com, sakari.ailus@linux.intel.com, javier@osg.samsung.com Cc: Shuah Khan <shuahkh@osg.samsung.com>, pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, perex@perex.cz, arnd@arndb.de, dan.carpenter@oracle.com, tvboxspy@gmail.com, crope@iki.fi, ruchandani.tina@gmail.com, corbet@lwn.net, chehabrafael@gmail.com, k.kozlowski@samsung.com, stefanr@s5r6.in-berlin.de, inki.dae@samsung.com, jh1009.sung@samsung.com, elfring@users.sourceforge.net, prabhakar.csengg@gmail.com, sw0312.kim@samsung.com, p.zabel@pengutronix.de, ricardo.ribalda@gmail.com, labbott@fedoraproject.org, pierre-louis.bossart@linux.intel.com, ricard.wanderlof@axis.com, julian@jusst.de, takamichiho@gmail.com, dominic.sacre@gmx.de, misterpib@gmail.com, daniel@zonque.org, gtmkramer@xs4all.nl, normalperson@yhbt.net, joe@oampo.co.uk, linuxbugs@vittgam.net, johan@oljud.se, klock.android@gmail.com, nenggun.kim@samsung.com, j.anaszewski@samsung.com, geliangtang Subject: [PATCH v3 15/22] media: au0828 handle media_init and media_register window Date: Thu, 11 Feb 2016 16:41:31 -0700 [thread overview] Message-ID: <31acd1abfe83e778ad6e9baa5494ca48a167d95a.1455233155.git.shuahkh@osg.samsung.com> (raw) In-Reply-To: <cover.1455233150.git.shuahkh@osg.samsung.com> In-Reply-To: <cover.1455233150.git.shuahkh@osg.samsung.com> Media device initialization and registration steps are split. There is a window between media device init and media device register during usb probe. au0828 bridge driver and snd-usb-audio could try to initialize the media device, if they simply checked, whether the device has been registered. They also need to check whether the device has been initialized. Change the au0828-core to check if media device is already initialized during initialization step and check if media device is already registered during the registration step. Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- drivers/media/usb/au0828/au0828-core.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c index a740bea..99f8022 100644 --- a/drivers/media/usb/au0828/au0828-core.c +++ b/drivers/media/usb/au0828/au0828-core.c @@ -228,7 +228,8 @@ static int au0828_media_device_init(struct au0828_dev *dev, if (!mdev) return -ENOMEM; - if (!media_devnode_is_registered(&mdev->devnode)) { + /* check if media device is already initialized */ + if (!mdev->dev) { mdev->dev = &udev->dev; if (udev->product) @@ -328,6 +329,27 @@ static int au0828_create_media_graph(struct au0828_dev *dev) return 0; } +static int au0828_media_device_register(struct au0828_dev *dev, + struct usb_device *udev) +{ +#ifdef CONFIG_MEDIA_CONTROLLER + int ret; + + if (dev->media_dev && + !media_devnode_is_registered(&dev->media_dev->devnode)) { + + /* register media device */ + ret = media_device_register(dev->media_dev); + if (ret) { + dev_err(&udev->dev, + "Media Device Register Error: %d\n", ret); + return ret; + } + } +#endif + return 0; +} + static int au0828_usb_probe(struct usb_interface *interface, const struct usb_device_id *id) { @@ -455,7 +477,7 @@ static int au0828_usb_probe(struct usb_interface *interface, } #ifdef CONFIG_MEDIA_CONTROLLER - retval = media_device_register(dev->media_dev); + retval = au0828_media_device_register(dev, usbdev); #endif done: -- 2.5.0
next prev parent reply other threads:[~2016-02-11 23:47 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-11 23:41 [PATCH v3 00/22] Sharing media resources across ALSA and au0828 drivers Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 01/22] [media] Docbook: media-types.xml: Add ALSA Media Controller Intf types Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-17 12:19 ` Mauro Carvalho Chehab 2016-02-17 12:19 ` Mauro Carvalho Chehab 2016-02-17 14:59 ` Shuah Khan 2016-02-17 14:59 ` Shuah Khan 2016-02-26 19:28 ` Shuah Khan 2016-02-26 19:28 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 02/22] uapi/media.h: Declare interface types for ALSA Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-17 12:21 ` Mauro Carvalho Chehab 2016-02-17 12:21 ` Mauro Carvalho Chehab 2016-02-26 19:30 ` Shuah Khan 2016-02-26 19:30 ` Shuah Khan 2016-02-26 19:38 ` Takashi Iwai 2016-02-26 19:38 ` Takashi Iwai 2016-03-03 14:59 ` Hans Verkuil 2016-03-03 14:59 ` Hans Verkuil 2016-03-03 15:57 ` Shuah Khan 2016-03-03 15:57 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 03/22] [media] Docbook: media-types.xml: Add Audio Function Entities Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-17 12:23 ` Mauro Carvalho Chehab 2016-02-17 12:23 ` Mauro Carvalho Chehab 2016-02-26 19:40 ` Takashi Iwai 2016-02-26 19:40 ` Takashi Iwai 2016-02-29 2:46 ` Laurent Pinchart 2016-03-03 22:50 ` Shuah Khan 2016-03-03 22:50 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 04/22] media: Add ALSA Media Controller function entities Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-17 12:25 ` Mauro Carvalho Chehab 2016-02-17 12:25 ` Mauro Carvalho Chehab 2016-02-26 19:40 ` Takashi Iwai 2016-02-26 19:40 ` Takashi Iwai 2016-02-11 23:41 ` [PATCH v3 05/22] media: Media Controller register/unregister entity_notify API Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 06/22] media: Media Controller enable/disable source handler API Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-03-10 7:35 ` Sakari Ailus 2016-03-10 7:35 ` Sakari Ailus 2016-03-10 14:29 ` Shuah Khan 2016-03-10 14:29 ` Shuah Khan 2016-03-13 20:11 ` Sakari Ailus 2016-03-13 20:11 ` Sakari Ailus 2016-03-14 15:22 ` Shuah Khan 2016-03-14 15:22 ` Shuah Khan 2016-03-17 9:30 ` Sakari Ailus 2016-03-17 9:30 ` Sakari Ailus 2016-02-11 23:41 ` [PATCH v3 07/22] media: Media Controller export non locking __media_entity_setup_link() Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 08/22] media: Media Controller non-locking __media_entity_pipeline_start/stop() Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 09/22] media: v4l-core add enable/disable source common interfaces Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 10/22] media: Move au8522_media_pads enum to au8522.h from au8522_priv.h Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 11/22] media: au8522 change to create MC pad for ALSA Audio Out Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 12/22] media: au0828 Use au8522_media_pads enum for pad defines Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 13/22] media: Change v4l-core to check if source is free Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-03-03 20:39 ` Olli Salonen 2016-03-03 21:18 ` Shuah Khan 2016-03-03 21:21 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 14/22] media: au0828 change to use Managed Media Controller API Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` Shuah Khan [this message] 2016-02-11 23:41 ` [PATCH v3 15/22] media: au0828 handle media_init and media_register window Shuah Khan 2016-02-11 23:41 ` [PATCH v3 16/22] media: au0828 create tuner to decoder link in disabled state Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 17/22] media: au0828 disable tuner to demod link Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 18/22] media: au0828-core register entity_notify hook Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 19/22] media: au0828 add enable, disable source handlers Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 20/22] media: dvb-frontend invoke enable/disable_source handlers Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 21/22] media: au0828 video change to use v4l_enable_media_source() Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-11 23:41 ` [PATCH v3 22/22] sound/usb: Use Media Controller API to share media resources Shuah Khan 2016-02-11 23:41 ` Shuah Khan 2016-02-26 19:33 ` Shuah Khan 2016-02-26 19:33 ` Shuah Khan 2016-02-26 19:55 ` Takashi Iwai 2016-02-26 19:55 ` Takashi Iwai 2016-02-26 20:08 ` Shuah Khan 2016-02-26 20:08 ` Shuah Khan 2016-02-26 20:50 ` Takashi Iwai 2016-02-26 20:50 ` Takashi Iwai 2016-02-27 2:55 ` Shuah Khan 2016-02-27 2:55 ` Shuah Khan 2016-02-27 7:48 ` Takashi Iwai 2016-02-27 7:48 ` Takashi Iwai 2016-02-27 12:41 ` Mauro Carvalho Chehab 2016-02-27 12:41 ` Mauro Carvalho Chehab 2016-02-29 6:01 ` Shuah Khan 2016-02-29 6:01 ` Shuah Khan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=31acd1abfe83e778ad6e9baa5494ca48a167d95a.1455233155.git.shuahkh@osg.samsung.com \ --to=shuahkh@osg.samsung.com \ --cc=albert@huitsing.nl \ --cc=alsa-devel@alsa-project.org \ --cc=arnd@arndb.de \ --cc=chehabrafael@gmail.com \ --cc=clemens@ladisch.de \ --cc=corbet@lwn.net \ --cc=crope@iki.fi \ --cc=dan.carpenter@oracle.com \ --cc=daniel@zonque.org \ --cc=dominic.sacre@gmx.de \ --cc=elfring@users.sourceforge.net \ --cc=geliangtang@163.com \ --cc=gtmkramer@xs4all.nl \ --cc=hans.verkuil@cisco.com \ --cc=inki.dae@samsung.com \ --cc=j.anaszewski@samsung.com \ --cc=javier@osg.samsung.com \ --cc=jh1009.sung@samsung.com \ --cc=joe@oampo.co.uk \ --cc=johan@oljud.se \ --cc=julian@jusst.de \ --cc=k.kozlowski@samsung.com \ --cc=klock.android@gmail.com \ --cc=kyungmin.park@samsung.com \ --cc=labbott@fedoraproject.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linuxbugs@vittgam.net \ --cc=m.szyprowski@samsung.com \ --cc=mchehab@osg.samsung.com \ --cc=misterpib@gmail.com \ --cc=nenggun.kim@samsung.com \ --cc=normalperson@yhbt.net \ --cc=p.zabel@pengutronix.de \ --cc=pawel@osciak.com \ --cc=perex@perex.cz \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=prabhakar.csengg@gmail.com \ --cc=ricard.wanderlof@axis.com \ --cc=ricardo.ribalda@gmail.com \ --cc=ruchandani.tina@gmail.com \ --cc=sakari.ailus@linux.intel.com \ --cc=stefanr@s5r6.in-berlin.de \ --cc=sw0312.kim@samsung.com \ --cc=takamichiho@gmail.com \ --cc=tiwai@suse.com \ --cc=tvboxspy@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.