On Wed, Feb 23, 2011 at 01:21:46AM +0100, Johan Hovold wrote:
> On Tue, Feb 22, 2011 at 03:27:55PM -0800, Greg Kroah-Hartman wrote:
> > From: Johan Hovold <jhovold@xxxxxxxxx>
> >
> > Cancel idle timer in musb_platform_exit.
>
> [...]
>
> > Cc: stable <stable@xxxxxxxxxx>
> > Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> > ---
> > drivers/usb/musb/omap2430.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> > index a3f1233..bc8badd 100644
> > --- a/drivers/usb/musb/omap2430.c
> > +++ b/drivers/usb/musb/omap2430.c
> > @@ -362,6 +362,7 @@ static int omap2430_musb_init(struct musb *musb)
> >
> > static int omap2430_musb_exit(struct musb *musb)
> > {
> > + del_timer_sync(&musb_idle_timer);
> >
> > omap2430_low_level_exit(musb);
> > otg_put_transceiver(musb->xceiv);
>
> Greg, did you notice that this patch was added twice, first by you and
> then again through Filipe's tree?
Yes, I mentioned it before when I pulled it in from Filipe's tree. Git
is smart and handled it just fine.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
