On Thu, Mar 24, 2011 at 01:58:51PM +0100, Arnd Bergmann wrote: > On Wednesday 23 March 2011, Greg KH wrote: > > > drivers/usb/serial/usb_wwan.c | 2 +- > > > > You don't modify this file in the diff, what caused this to show up in > > the diffstat? > > Following up on this, since I saw the problem again: > > /home/arnd/linux-2.6/drivers/usb/serial/usb_wwan.c: In function 'play_delayed': > /home/arnd/linux-2.6/drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count' > make[2]: *** [drivers/usb/serial/usb_wwan.o] Error 1 > > The problem is that with CONFIG_PM_RUNTIME disabled, the dev_pm_info > does not have the usage_count member that the driver accesses since > the recent 16871dca "usb_wwan: error case of resume": > > + /* we have to throw away the rest */ > + do { > + unbusy_queued_urb(urb, portdata); > + //extremely dirty > + atomic_dec(&port->serial->interface->dev.power.usage_count); > + } while ((urb = usb_get_from_anchor(&portdata->delayed))); > + break; This is fixed in my git tree and will be sent to Linus in a few hours. 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