diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 16:22:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 16:22:55 +0200 |
| commit | 99805f47dd0ede2e96f2c62c588a0d906811ed6d (patch) | |
| tree | b8256eb1e09d04fb986d182528e0cb1becc8dc19 /drivers/usb/input | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | [PATCH] USB: Fix for ati_remote (diff) | |
| download | linux-99805f47dd0ede2e96f2c62c588a0d906811ed6d.tar.xz linux-99805f47dd0ede2e96f2c62c588a0d906811ed6d.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/input')
| -rw-r--r-- | drivers/usb/input/ati_remote.c | 2 | ||||
| -rw-r--r-- | drivers/usb/input/usbkbd.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c index 355add5c29f5..860df26323b1 100644 --- a/drivers/usb/input/ati_remote.c +++ b/drivers/usb/input/ati_remote.c @@ -619,7 +619,7 @@ static void ati_remote_delete(struct ati_remote *ati_remote) if (ati_remote->outbuf) usb_buffer_free(ati_remote->udev, DATA_BUFSIZE, - ati_remote->inbuf, ati_remote->outbuf_dma); + ati_remote->outbuf, ati_remote->outbuf_dma); if (ati_remote->irq_urb) usb_free_urb(ati_remote->irq_urb); diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c index 01514b0551b8..7038fb9d1ced 100644 --- a/drivers/usb/input/usbkbd.c +++ b/drivers/usb/input/usbkbd.c @@ -133,7 +133,8 @@ resubmit: kbd->usbdev->devpath, i); } -int usb_kbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) +static int usb_kbd_event(struct input_dev *dev, unsigned int type, + unsigned int code, int value) { struct usb_kbd *kbd = dev->private; |