diff mbox

usb: musb: omap2430: fix build failure

Message ID 1302025834-25729-1-git-send-email-jhovold@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Johan Hovold April 5, 2011, 5:50 p.m. UTC
Fix build failure introduced by commit
7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention
and offmode support for OMAP3) when building without gadget
support.

  CC      drivers/usb/musb/omap2430.o
drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’:
drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 drivers/usb/musb/omap2430.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

Johan Hovold April 13, 2011, 5:01 p.m. UTC | #1
Hi Filipe, 

On Tue, Apr 05, 2011 at 07:50:34PM +0200, Johan Hovold wrote:
> Fix build failure introduced by commit
> 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention
> and offmode support for OMAP3) when building without gadget
> support.
> 
>   CC      drivers/usb/musb/omap2430.o
> drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’:
> drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’

I noted that this one wasn't included in your pull-request today. Just
thought I'd send a reminder as I haven't received any feedback.

Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi April 13, 2011, 5:22 p.m. UTC | #2
Hi,

On Wed, Apr 13, 2011 at 07:01:39PM +0200, Johan Hovold wrote:
> On Tue, Apr 05, 2011 at 07:50:34PM +0200, Johan Hovold wrote:
> > Fix build failure introduced by commit
> > 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention
> > and offmode support for OMAP3) when building without gadget
> > support.
> > 
> >   CC      drivers/usb/musb/omap2430.o
> > drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’:
> > drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’
> 
> I noted that this one wasn't included in your pull-request today. Just
> thought I'd send a reminder as I haven't received any feedback.

Sorry about that, I missed it from my queue. I'll add and send on a
separate pull request. Thanks for the note.
Greg KH April 13, 2011, 10:27 p.m. UTC | #3
On Wed, Apr 13, 2011 at 08:22:51PM +0300, Felipe Balbi wrote:
> Hi,
> 
> On Wed, Apr 13, 2011 at 07:01:39PM +0200, Johan Hovold wrote:
> > On Tue, Apr 05, 2011 at 07:50:34PM +0200, Johan Hovold wrote:
> > > Fix build failure introduced by commit
> > > 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention
> > > and offmode support for OMAP3) when building without gadget
> > > support.
> > > 
> > >   CC      drivers/usb/musb/omap2430.o
> > > drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’:
> > > drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’
> > 
> > I noted that this one wasn't included in your pull-request today. Just
> > thought I'd send a reminder as I haven't received any feedback.
> 
> Sorry about that, I missed it from my queue. I'll add and send on a
> separate pull request. Thanks for the note.

I can pick it up right now.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi April 14, 2011, 10:34 a.m. UTC | #4
On Wed, Apr 13, 2011 at 03:27:44PM -0700, Greg KH wrote:
> On Wed, Apr 13, 2011 at 08:22:51PM +0300, Felipe Balbi wrote:
> > Hi,
> > 
> > On Wed, Apr 13, 2011 at 07:01:39PM +0200, Johan Hovold wrote:
> > > On Tue, Apr 05, 2011 at 07:50:34PM +0200, Johan Hovold wrote:
> > > > Fix build failure introduced by commit
> > > > 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention
> > > > and offmode support for OMAP3) when building without gadget
> > > > support.
> > > > 
> > > >   CC      drivers/usb/musb/omap2430.o
> > > > drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’:
> > > > drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’
> > > 
> > > I noted that this one wasn't included in your pull-request today. Just
> > > thought I'd send a reminder as I haven't received any feedback.
> > 
> > Sorry about that, I missed it from my queue. I'll add and send on a
> > separate pull request. Thanks for the note.
> 
> I can pick it up right now.

Thanks Greg, here's my SOB line:

Signed-off-by: Felipe Balbi <balbi@ti.com>
diff mbox

Patch

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 25cb8b0..57a27fa 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -259,9 +259,10 @@  static int musb_otg_notifications(struct notifier_block *nb,
 	case USB_EVENT_VBUS:
 		DBG(4, "VBUS Connect\n");
 
+#ifdef CONFIG_USB_GADGET_MUSB_HDRC
 		if (musb->gadget_driver)
 			pm_runtime_get_sync(musb->controller);
-
+#endif
 		otg_init(musb->xceiv);
 		break;