From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Axel Lin <axel.lin@gmail•com>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: linux-next: manual merge of the usb tree with the input tree
Date: Fri, 30 Apr 2010 15:51:15 +1000 [thread overview]
Message-ID: <20100430155115.fbc54b24.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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 = {
next reply other threads:[~2010-04-30 5:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 5:51 Stephen Rothwell [this message]
2010-04-30 14:44 ` linux-next: manual merge of the usb tree with the input tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2012-05-03 4:44 Stephen Rothwell
2012-05-03 21:49 ` Greg KH
2010-04-30 5:51 Stephen Rothwell
2010-04-30 14:44 ` Greg KH
2010-04-30 5:51 Stephen Rothwell
2010-04-30 14:44 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100430155115.fbc54b24.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axel.lin@gmail$(echo .)com \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox