Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754787AbbETVU3 (ORCPT ); Wed, 20 May 2015 17:20:29 -0400 Received: from mga11.intel.com ([192.55.52.93]:17407 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753684AbbETVU0 (ORCPT ); Wed, 20 May 2015 17:20:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,466,1427785200"; d="scan'208";a="729249543" Date: Wed, 20 May 2015 14:22:36 -0700 From: David Cohen To: Sasha Levin Cc: heikki.krogerus@linux.intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com Subject: Re: [PATCH] usb: ulpi: don't register drivers if bus doesn't exist Message-ID: <20150520212235.GA20943@psi-dev26.jf.intel.com> References: <1432150406-20550-1-git-send-email-sasha.levin@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432150406-20550-1-git-send-email-sasha.levin@oracle.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1616 Lines: 52 Hi, On Wed, May 20, 2015 at 03:33:26PM -0400, Sasha Levin wrote: > ULPI registers it's bus at module_init so if the bus fails to register, the A minor comment: s/it's/its/ > 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-existant 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 > --- > drivers/usb/common/ulpi.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/usb/common/ulpi.c b/drivers/usb/common/ulpi.c > index 0e6f968..0b0a5e7 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 (!ulpi_bus.p) > + return -ENODEV; > + Good catch. Otherwise it may trigger BUG() on driver_register(). I wonder if it would be nice to have a macro for that checking :) Anyway, Reviewed-by: David Cohen > drv->driver.bus = &ulpi_bus; > > return driver_register(&drv->driver); > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/