All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Lu, Baolu" <baolu.lu@linux.intel.com>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sasha.levin@oracle.com>,
	David Cohen <david.a.cohen@linux.intel.com>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] usb: ulpi: don't register drivers if bus doesn't exist
Date: Thu, 21 May 2015 18:07:25 +0800	[thread overview]
Message-ID: <555DAE5D.3030209@linux.intel.com> (raw)
In-Reply-To: <1432198672-384-1-git-send-email-baolu.lu@linux.intel.com>

Hi Heikki, Sasha and others,

Please ignore this patch. I should not squash these two patches into one and
sign it off behalf of other people. I apologize for this and I'm sorry 
if this lets
you feel affronted.

Thanks,
Baolu


On 05/21/2015 04:57 PM, Lu Baolu wrote:
> ULPI registers its bus at module_init, so if the bus fails to register, the
> module will fail to load and all will be well in the world.
>
> However, if the ULPI code is built-in rather than a module, the bus
> initialization may fail, but we'd still try to register drivers later onto
> a non-existent bus, which will panic the kernel.
>
> Fix that by checking that the bus was indeed initialized before trying to
> register drivers on top of it.
>
> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
> Reported-by: Zhuo Qiuxu <qiuxu.zhuo@intel.com>
> Reviewed-by: David Cohen <david.a.cohen@linux.intel.com>
> ---
>   drivers/usb/common/ulpi.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c
> index 0e6f968..af52b46 100644
> --- a/drivers/usb/common/ulpi.c
> +++ b/drivers/usb/common/ulpi.c
> @@ -132,6 +132,10 @@ int ulpi_register_driver(struct ulpi_driver *drv)
>   	if (!drv->probe)
>   		return -EINVAL;
>   
> +	/* Was the bus registered successfully? */
> +	if (unlikely(WARN_ON(!ulpi_bus.p)))
> +		return -ENODEV;
> +
>   	drv->driver.bus = &ulpi_bus;
>   
>   	return driver_register(&drv->driver);
> @@ -242,7 +246,7 @@ static int __init ulpi_init(void)
>   {
>   	return bus_register(&ulpi_bus);
>   }
> -module_init(ulpi_init);
> +subsys_initcall(ulpi_init);
>   
>   static void __exit ulpi_exit(void)
>   {


  reply	other threads:[~2015-05-21 10:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-21  8:57 [PATCH 1/1] usb: ulpi: don't register drivers if bus doesn't exist Lu Baolu
2015-05-21 10:07 ` Lu, Baolu [this message]
2015-05-21 10:16   ` Heikki Krogerus
2015-05-24 16:26 ` Greg Kroah-Hartman

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=555DAE5D.3030209@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=david.a.cohen@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=sasha.levin@oracle.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: link
Be 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.