linux-next: manual merge of the usb tree with the input tree
From: Stephen Rothwell
Date: Fri Apr 30 2010 - 13:38:00 EST
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/kbtab.c between commits
ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 ("Input: kbtab - fix incorrect
size parameter in usb_buffer_free") and
331cb022d3ac1f85f7842a51495c33c629e947bc ("Input: kbtab - simplify
kbtab_disconnect()") 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@xxxxxxxxxxxxxxxx
diff --cc drivers/input/tablet/kbtab.c
index b9969f1,d31b9c7..0000000
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@@ -173,7 -182,7 +173,7 @@@ static int kbtab_probe(struct usb_inter
return 0;
fail3: usb_free_urb(kbtab->irq);
- fail2: usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
- fail2: usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma);
++ fail2: usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
fail1: input_free_device(input_dev);
kfree(kbtab);
return error;
@@@ -184,11 -193,13 +184,11 @@@ static void kbtab_disconnect(struct usb
struct kbtab *kbtab = usb_get_intfdata(intf);
usb_set_intfdata(intf, NULL);
- if (kbtab) {
- usb_kill_urb(kbtab->irq);
- input_unregister_device(kbtab->dev);
- usb_free_urb(kbtab->irq);
- usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
- kfree(kbtab);
- }
+
+ input_unregister_device(kbtab->dev);
+ usb_free_urb(kbtab->irq);
- usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
++ usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
+ kfree(kbtab);
}
static struct usb_driver kbtab_driver = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/