Date: Sun, 5 Apr 2009 18:18:47 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190724 - head/sys/dev/usb/controller Message-ID: <200904051818.n35IIlS7027463@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Sun Apr 5 18:18:47 2009 New Revision: 190724 URL: http://svn.freebsd.org/changeset/base/190724 Log: MFp4 //depot/projects/usb@159700 Get rid of the last CALLOUT_RETURNUNLOCKED reference. Submitted by: Hans Petter Selasky Modified: head/sys/dev/usb/controller/usb_controller.c Modified: head/sys/dev/usb/controller/usb_controller.c ============================================================================== --- head/sys/dev/usb/controller/usb_controller.c Sun Apr 5 18:18:36 2009 (r190723) +++ head/sys/dev/usb/controller/usb_controller.c Sun Apr 5 18:18:47 2009 (r190724) @@ -277,7 +277,7 @@ usb2_power_wdog(void *arg) usb2_bus_power_update(bus); - return; + USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -356,11 +356,8 @@ usb2_bus_attach(struct usb2_proc_msg *pm /* set softc - we are ready */ device_set_softc(dev, bus); - /* start watchdog - this function will unlock the BUS lock ! */ + /* start watchdog */ usb2_power_wdog(bus); - - /* need to return locked */ - USB_BUS_LOCK(bus); } /*------------------------------------------------------------------------* @@ -534,7 +531,7 @@ usb2_bus_mem_alloc_all(struct usb2_bus * NULL, MTX_DEF | MTX_RECURSE); usb2_callout_init_mtx(&bus->power_wdog, - &bus->bus_mtx, CALLOUT_RETURNUNLOCKED); + &bus->bus_mtx, 0); TAILQ_INIT(&bus->intr_q.head);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904051818.n35IIlS7027463>