diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
| commit | 52f9a4e5b2eae78dceb70971ee7df8e1db330239 (patch) | |
| tree | 56a3b69004fa80da2a2d9afb6498b79db9fea434 /linux/drivers/media/video/pwc/pwc-if.c | |
| parent | 6e323483b126ac7589cadb5bad2f666cf4b7eb9d (diff) | |
| parent | a2aa04e72cd03545056bd4a9a7cdd6b340908ca2 (diff) | |
| download | mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.gz mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-no-audio
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-if.c')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index b3765e280..eaeea5520 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -605,7 +605,7 @@ static void pwc_snapshot_button(struct pwc_device *pdev, int down) #ifdef CONFIG_USB_PWC_INPUT_EVDEV if (pdev->button_dev) { - input_report_key(pdev->button_dev, BTN_0, down); + input_report_key(pdev->button_dev, KEY_CAMERA, down); input_sync(pdev->button_dev); } #endif @@ -1859,7 +1859,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id pdev->button_dev->cdev.dev = &pdev->udev->dev; #endif pdev->button_dev->evbit[0] = BIT_MASK(EV_KEY); - pdev->button_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); + pdev->button_dev->keybit[BIT_WORD(KEY_CAMERA)] = BIT_MASK(KEY_CAMERA); rc = input_register_device(pdev->button_dev); if (rc) { |