diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2011-08-06 23:18:07 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-22 15:47:41 +0200 |
| commit | 9688efda3fb0abb487ae44ced1dd02d14a4312c4 (patch) | |
| tree | ad79c621ace7f18a8c02d9a8be21d0a00f9cc75f /drivers/media/rc/ati_remote.c | |
| parent | [media] adp1653: set media entity type (diff) | |
| download | linux-9688efda3fb0abb487ae44ced1dd02d14a4312c4.tar.xz linux-9688efda3fb0abb487ae44ced1dd02d14a4312c4.zip | |
[media] move ati_remote driver from input/misc to media/rc
The driver will be migrated to the RC driver API in a following
commit.
[mchehab@redhat.com: Fix some bad whitespacing]
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/rc/ati_remote.c (renamed from drivers/input/misc/ati_remote.c) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/ati_remote.c b/drivers/media/rc/ati_remote.c index bce57129afba..53388a558a57 100644 --- a/drivers/input/misc/ati_remote.c +++ b/drivers/media/rc/ati_remote.c @@ -105,7 +105,7 @@ #define NVIDIA_REMOTE_PRODUCT_ID 0x0005 #define MEDION_REMOTE_PRODUCT_ID 0x0006 -#define DRIVER_VERSION "2.2.1" +#define DRIVER_VERSION "2.2.1" #define DRIVER_AUTHOR "Torrey Hoffman <thoffman@arnor.net>" #define DRIVER_DESC "ATI/X10 RF USB Remote Control" @@ -481,7 +481,7 @@ static void ati_remote_input_report(struct urb *urb) /* Mask unwanted remote channels. */ /* note: remote_num is 0-based, channel 1 on remote == 0 here */ remote_num = (data[3] >> 4) & 0x0f; - if (channel_mask & (1 << (remote_num + 1))) { + if (channel_mask & (1 << (remote_num + 1))) { dbginfo(&ati_remote->interface->dev, "Masked input from channel 0x%02x: data %02x,%02x, mask= 0x%02lx\n", remote_num, data[1], data[2], channel_mask); @@ -630,7 +630,7 @@ static int ati_remote_alloc_buffers(struct usb_device *udev, return -1; ati_remote->outbuf = usb_alloc_coherent(udev, DATA_BUFSIZE, GFP_ATOMIC, - &ati_remote->outbuf_dma); + &ati_remote->outbuf_dma); if (!ati_remote->outbuf) return -1; |