tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] em28xx: move snapshot button bit definition for reg 0x0C from em28xx-input.c to em28xx.h

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Frank Schaefer and committed by
Mauro Carvalho Chehab bc677fff c074fc4c

+2 -2
-1
drivers/media/usb/em28xx/em28xx-input.c
··· 32 32 33 33 #define EM28XX_SNAPSHOT_KEY KEY_CAMERA 34 34 #define EM28XX_SBUTTON_QUERY_INTERVAL 500 35 - #define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 36 35 37 36 static unsigned int ir_debug; 38 37 module_param(ir_debug, int, 0644);
+2 -1
drivers/media/usb/em28xx/em28xx-reg.h
··· 68 68 69 69 70 70 #define EM28XX_R0A_CHIPID 0x0a 71 - #define EM28XX_R0C_USBSUSP 0x0c /* */ 71 + #define EM28XX_R0C_USBSUSP 0x0c 72 + #define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 /* 1=button pressed, needs reset */ 72 73 73 74 #define EM28XX_R0E_AUDIOSRC 0x0e 74 75 #define EM28XX_R0F_XCLK 0x0f