From: Pete Zaitcev Date: Tue, 14 Aug 2007 07:42:53 +0000 (-0700) Subject: usbmon: Smooth the core code X-Git-Tag: v2.6.24-rc1~1395^2~87 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c36d54ab380fb8edeaa22776af869c64bfda43bd;p=linux-2.6 usbmon: Smooth the core code Two things: - mbus can be NULL (in case of bus removal while reader is reading) - Remove a useless assignment Signed-off-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index e58f761d06..2e317bd79e 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c @@ -148,18 +148,8 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb) { struct mon_bus *mbus; - mbus = ubus->mon_bus; - if (mbus == NULL) { - /* - * This should not happen. - * At this point we do not even know the bus number... - */ - printk(KERN_ERR TAG ": Null mon bus in URB, address %p\n", - urb); - return; - } - - mon_bus_complete(mbus, urb); + if ((mbus = ubus->mon_bus) != NULL) + mon_bus_complete(mbus, urb); mon_bus_complete(&mon_bus0, urb); } @@ -170,7 +160,7 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb) */ static void mon_stop(struct mon_bus *mbus) { - struct usb_bus *ubus = mbus->u_bus; + struct usb_bus *ubus; struct list_head *p; if (mbus == &mon_bus0) {