linux-next: manual merge of the usb tree with the input tree
in [Kernel]
|
Prev: staging: et131x: et1310_eeprom.c coding style fixes.
Next: linux-next: manual merge of the bkl-ioctl tree with the fixes tree
From: Stephen Rothwell on 30 Apr 2010 13:30 Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/input/tablet/wacom_sys.c between commits 4492efffffeb88d87e7aa74765f3c53b3a7dd40f ("Input: wacom - share pen info with touch of the same ID") and 51269fe86c263ec4fafbafe82970e6d7f6f79102 ("Input: wacom - do not allocate wacom_wac separately") from the input tree and commit 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc() and usb_buffer_free() users") from the usb tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/input/tablet/wacom_sys.c index d90f4e0,191197c..0000000 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c @@@ -534,11 -632,11 +534,11 @@@ static int wacom_probe(struct usb_inter usb_set_intfdata(intf, wacom); return 0; + fail4: wacom_remove_shared_data(wacom_wac); fail3: usb_free_urb(wacom->irq); - fail2: usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); + fail2: usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma); fail1: input_free_device(input_dev); kfree(wacom); - kfree(wacom_wac); return error; } @@@ -549,11 -647,11 +549,11 @@@ static void wacom_disconnect(struct usb usb_set_intfdata(intf, NULL); usb_kill_urb(wacom->irq); - input_unregister_device(wacom->dev); + input_unregister_device(wacom->wacom_wac.input); usb_free_urb(wacom->irq); - usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, + usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX, - wacom->wacom_wac->data, wacom->data_dma); - kfree(wacom->wacom_wac); + wacom->wacom_wac.data, wacom->data_dma); + wacom_remove_shared_data(&wacom->wacom_wac); kfree(wacom); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |