On Wed, Aug 04, 2010 at 10:53:46PM +0100, Alan Cox wrote: > From: Hao Wu <hao.wu@xxxxxxxxx> > > Subject: [PATCH] USB OTG Langwell: Fix missing init_timer and add pointer check in timer init. > > This patch added missed init_timer function for kernel timer of stata machine. > and add pointer check for timer kmalloc. > > modified: drivers/usb/otg/langwell_otg.c Something went wrong with your git commit here, wrong Subject: and wierd body with a modified line :( > > Signed-off-by: Hao Wu <hao.wu@xxxxxxxxx> > Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx> > --- > > drivers/usb/otg/langwell_otg.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > > diff --git a/drivers/usb/otg/langwell_otg.c b/drivers/usb/otg/langwell_otg.c > index 83d7941..4378c64 100644 > --- a/drivers/usb/otg/langwell_otg.c > +++ b/drivers/usb/otg/langwell_otg.c > @@ -122,6 +122,9 @@ static inline struct langwell_otg_timer *otg_timer_initializer > { > struct langwell_otg_timer *timer; > timer = kmalloc(sizeof(struct langwell_otg_timer), GFP_KERNEL); > + if (timer == NULL) > + return timer; > + > timer->function = function; > timer->expires = expires; > timer->data = data; > @@ -2018,6 +2021,7 @@ static int langwell_otg_probe(struct pci_dev *pdev, > goto err; > } > > + init_timer(&langwell->hsm_timer); Doesn't this patch really need to be rolled in with the previous one so that there are no 'git bisect' problems? 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