Messages in this thread | | | Date | Tue, 30 Jul 2013 14:08:10 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb-gadget tree with the usb.current tree |
| |
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget: udc-core: fix the typo of udc state attribute") from the usb.current tree and commit 5702f75375aa ("usb: gadget: udc-core: move sysfs_notify() to a workqueue") from the usb-gadget tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/gadget/udc-core.c index 13e25f8,3122ab9..0000000 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ /* ------------------------------------------------------------------------- */ + static void usb_gadget_state_work(struct work_struct *work) + { + struct usb_gadget *gadget = work_to_gadget(work); + - sysfs_notify(&gadget->dev.kobj, NULL, "status"); ++ sysfs_notify(&gadget->dev.kobj, NULL, "state"); + } + void usb_gadget_set_state(struct usb_gadget *gadget, enum usb_device_state state) { [unhandled content-type:application/pgp-signature] | |