* [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next
@ 2012-07-10 6:32 Gerard Snitselaar
2012-07-10 14:40 ` Greg KH
2012-07-11 12:16 ` Sergei Shtylyov
0 siblings, 2 replies; 4+ messages in thread
From: Gerard Snitselaar @ 2012-07-10 6:32 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-usb, gregkh, balbi, kishon
commit ff9cce82 added back 2 lines that were removed by commit
c83a8542 causing build of twl6030-usb to get an error due to otg being
referenced, but not declared. This patch removes those 2 lines again
to restore intent of commit c83a8542.
Signed-off-by: Gerard Snitselaar <dev@snitselaar.org>
---
drivers/usb/otg/twl6030-usb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index a3d0c04..6907d8d 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -302,8 +302,6 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR);
twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
status = OMAP_MUSB_ID_GROUND;
- otg->default_a = true;
- twl->phy.state = OTG_STATE_A_IDLE;
twl->linkstat = status;
omap_musb_mailbox(status);
} else {
--
1.7.11.1.165.g299666c
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next
2012-07-10 6:32 [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next Gerard Snitselaar
@ 2012-07-10 14:40 ` Greg KH
2012-07-10 15:13 ` Gerard Snitselaar
2012-07-11 12:16 ` Sergei Shtylyov
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2012-07-10 14:40 UTC (permalink / raw)
To: Gerard Snitselaar; +Cc: linux-kernel, linux-usb, balbi, kishon
On Mon, Jul 09, 2012 at 11:32:20PM -0700, Gerard Snitselaar wrote:
> commit ff9cce82 added back 2 lines that were removed by commit
> c83a8542 causing build of twl6030-usb to get an error due to otg being
> referenced, but not declared. This patch removes those 2 lines again
> to restore intent of commit c83a8542.
>
> Signed-off-by: Gerard Snitselaar <dev@snitselaar.org>
> ---
> drivers/usb/otg/twl6030-usb.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
> index a3d0c04..6907d8d 100644
> --- a/drivers/usb/otg/twl6030-usb.c
> +++ b/drivers/usb/otg/twl6030-usb.c
> @@ -302,8 +302,6 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
> twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR);
> twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
> status = OMAP_MUSB_ID_GROUND;
> - otg->default_a = true;
> - twl->phy.state = OTG_STATE_A_IDLE;
Didn't I apply this same patch yesterday? Can you verify that this is
still needed in the usb-next branch of my git tree?
confused,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next
2012-07-10 14:40 ` Greg KH
@ 2012-07-10 15:13 ` Gerard Snitselaar
0 siblings, 0 replies; 4+ messages in thread
From: Gerard Snitselaar @ 2012-07-10 15:13 UTC (permalink / raw)
To: Greg KH; +Cc: linux-kernel, linux-usb, balbi, kishon
Yes, ignore my patch. It was applied to usb-next already and I forgot to check there.
Jerry
On Tue Jul 10 12, Greg KH wrote:
> On Mon, Jul 09, 2012 at 11:32:20PM -0700, Gerard Snitselaar wrote:
> > commit ff9cce82 added back 2 lines that were removed by commit
> > c83a8542 causing build of twl6030-usb to get an error due to otg being
> > referenced, but not declared. This patch removes those 2 lines again
> > to restore intent of commit c83a8542.
> >
> > Signed-off-by: Gerard Snitselaar <dev@snitselaar.org>
> > ---
> > drivers/usb/otg/twl6030-usb.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
> > index a3d0c04..6907d8d 100644
> > --- a/drivers/usb/otg/twl6030-usb.c
> > +++ b/drivers/usb/otg/twl6030-usb.c
> > @@ -302,8 +302,6 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
> > twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR);
> > twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET);
> > status = OMAP_MUSB_ID_GROUND;
> > - otg->default_a = true;
> > - twl->phy.state = OTG_STATE_A_IDLE;
>
> Didn't I apply this same patch yesterday? Can you verify that this is
> still needed in the usb-next branch of my git tree?
>
> confused,
>
> greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next
2012-07-10 6:32 [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next Gerard Snitselaar
2012-07-10 14:40 ` Greg KH
@ 2012-07-11 12:16 ` Sergei Shtylyov
1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2012-07-11 12:16 UTC (permalink / raw)
To: Gerard Snitselaar; +Cc: linux-kernel, linux-usb, gregkh, balbi, kishon
Hello.
On 10-07-2012 10:32, Gerard Snitselaar wrote:
> commit ff9cce82 added back 2 lines that were removed by commit
> c83a8542
Please also specify the summaries of those 2 commits in parens.
> causing build of twl6030-usb to get an error due to otg being
> referenced, but not declared. This patch removes those 2 lines again
> to restore intent of commit c83a8542.
> Signed-off-by: Gerard Snitselaar <dev@snitselaar.org>
WBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-11 12:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-10 6:32 [PATCH] usb: twl6030-usb: variable otg not declared in twl6030_usbotg_irq() in linux-next Gerard Snitselaar
2012-07-10 14:40 ` Greg KH
2012-07-10 15:13 ` Gerard Snitselaar
2012-07-11 12:16 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox