diff options
-rw-r--r-- | drivers/media/video/pwc/pwc-if.c | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/konicawc.c | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/quickcam_messenger.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c index 7c542caf248..519a965de23 100644 --- a/drivers/media/video/pwc/pwc-if.c +++ b/drivers/media/video/pwc/pwc-if.c | |||
@@ -601,7 +601,7 @@ static void pwc_snapshot_button(struct pwc_device *pdev, int down) | |||
601 | 601 | ||
602 | #ifdef CONFIG_USB_PWC_INPUT_EVDEV | 602 | #ifdef CONFIG_USB_PWC_INPUT_EVDEV |
603 | if (pdev->button_dev) { | 603 | if (pdev->button_dev) { |
604 | input_report_key(pdev->button_dev, BTN_0, down); | 604 | input_report_key(pdev->button_dev, KEY_CAMERA, down); |
605 | input_sync(pdev->button_dev); | 605 | input_sync(pdev->button_dev); |
606 | } | 606 | } |
607 | #endif | 607 | #endif |
@@ -1847,7 +1847,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id | |||
1847 | usb_to_input_id(pdev->udev, &pdev->button_dev->id); | 1847 | usb_to_input_id(pdev->udev, &pdev->button_dev->id); |
1848 | pdev->button_dev->dev.parent = &pdev->udev->dev; | 1848 | pdev->button_dev->dev.parent = &pdev->udev->dev; |
1849 | pdev->button_dev->evbit[0] = BIT_MASK(EV_KEY); | 1849 | pdev->button_dev->evbit[0] = BIT_MASK(EV_KEY); |
1850 | pdev->button_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); | 1850 | pdev->button_dev->keybit[BIT_WORD(KEY_CAMERA)] = BIT_MASK(KEY_CAMERA); |
1851 | 1851 | ||
1852 | rc = input_register_device(pdev->button_dev); | 1852 | rc = input_register_device(pdev->button_dev); |
1853 | if (rc) { | 1853 | if (rc) { |
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index 900ec2129ca..31d57f2d09e 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
@@ -240,7 +240,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev | |||
240 | input_dev->dev.parent = &dev->dev; | 240 | input_dev->dev.parent = &dev->dev; |
241 | 241 | ||
242 | input_dev->evbit[0] = BIT_MASK(EV_KEY); | 242 | input_dev->evbit[0] = BIT_MASK(EV_KEY); |
243 | input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); | 243 | input_dev->keybit[BIT_WORD(KEY_CAMERA)] = BIT_MASK(KEY_CAMERA); |
244 | 244 | ||
245 | error = input_register_device(cam->input); | 245 | error = input_register_device(cam->input); |
246 | if (error) { | 246 | if (error) { |
@@ -263,7 +263,7 @@ static void konicawc_unregister_input(struct konicawc *cam) | |||
263 | static void konicawc_report_buttonstat(struct konicawc *cam) | 263 | static void konicawc_report_buttonstat(struct konicawc *cam) |
264 | { | 264 | { |
265 | if (cam->input) { | 265 | if (cam->input) { |
266 | input_report_key(cam->input, BTN_0, cam->buttonsts); | 266 | input_report_key(cam->input, KEY_CAMERA, cam->buttonsts); |
267 | input_sync(cam->input); | 267 | input_sync(cam->input); |
268 | } | 268 | } |
269 | } | 269 | } |
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index fd112f0b9d3..803d3e4e29a 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
@@ -103,7 +103,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev) | |||
103 | input_dev->dev.parent = &dev->dev; | 103 | input_dev->dev.parent = &dev->dev; |
104 | 104 | ||
105 | input_dev->evbit[0] = BIT_MASK(EV_KEY); | 105 | input_dev->evbit[0] = BIT_MASK(EV_KEY); |
106 | input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); | 106 | input_dev->keybit[BIT_WORD(KEY_CAMERA)] = BIT_MASK(KEY_CAMERA); |
107 | 107 | ||
108 | error = input_register_device(cam->input); | 108 | error = input_register_device(cam->input); |
109 | if (error) { | 109 | if (error) { |
@@ -126,7 +126,7 @@ static void qcm_unregister_input(struct qcm *cam) | |||
126 | static void qcm_report_buttonstat(struct qcm *cam) | 126 | static void qcm_report_buttonstat(struct qcm *cam) |
127 | { | 127 | { |
128 | if (cam->input) { | 128 | if (cam->input) { |
129 | input_report_key(cam->input, BTN_0, cam->button_sts); | 129 | input_report_key(cam->input, KEY_CAMERA, cam->button_sts); |
130 | input_sync(cam->input); | 130 | input_sync(cam->input); |
131 | } | 131 | } |
132 | } | 132 | } |