Simon Schricker d68175
From: Simon Schricker <sschricker@suse.de>
Simon Schricker d68175
Date: Tue, 24 Sep 2019 14:35:39 +0200
Simon Schricker d68175
Subject: [PATCH] media: em28xx: fix handler for vidioc_s_input()
Simon Schricker d68175
Patch-mainline: never, kabi
Simon Schricker d68175
References: bsc#1051510
Simon Schricker d68175
Simon Schricker d68175
Signed-off-by: Simon Schricker <sschricker@suse.de>
Simon Schricker d68175
---
Simon Schricker d68175
 drivers/media/usb/em28xx/em28xx.h |    8 ++++++--
Simon Schricker d68175
 1 file changed, 6 insertions(+), 2 deletions(-)
Simon Schricker d68175
Simon Schricker d68175
--- a/drivers/media/usb/em28xx/em28xx.h
Simon Schricker d68175
+++ b/drivers/media/usb/em28xx/em28xx.h
Simon Schricker d68175
@@ -330,9 +330,14 @@ enum em28xx_usb_audio_type {
Simon Schricker d68175
    address more than two different entries.
Simon Schricker d68175
  */
Simon Schricker d68175
 enum em28xx_amux {
Simon Schricker d68175
+#ifndef __GENKSYMS__
Simon Schricker d68175
 	EM28XX_AMUX_UNUSED = -1,
Simon Schricker d68175
 	/* This is the only entry for em28xx tuner input */
Simon Schricker d68175
 	EM28XX_AMUX_VIDEO = 0,	/* em28xx tuner, AC97 mixer Video */
Simon Schricker d68175
+#else
Simon Schricker d68175
+	/* This is the only entry for em28xx tuner input */
Simon Schricker d68175
+	EM28XX_AMUX_VIDEO,	/* em28xx tuner, AC97 mixer Video */
Simon Schricker d68175
+#endif
Simon Schricker d68175
 
Simon Schricker d68175
 	EM28XX_AMUX_LINE_IN,	/* AC97 mixer Line In */
Simon Schricker d68175
 
Simon Schricker d68175
@@ -651,8 +656,6 @@ struct em28xx {
Simon Schricker d68175
 	unsigned int ctl_input;	/* selected input */
Simon Schricker d68175
 	unsigned int ctl_ainput;/* selected audio input */
Simon Schricker d68175
 	unsigned int ctl_aoutput;/* selected audio output */
Simon Schricker d68175
-	enum em28xx_amux amux_map[MAX_EM28XX_INPUT];
Simon Schricker d68175
-
Simon Schricker d68175
 	int mute;
Simon Schricker d68175
 	int volume;
Simon Schricker d68175
 
Simon Schricker d68175
@@ -732,6 +735,7 @@ struct em28xx {
Simon Schricker d68175
 #ifndef __GENKSYMS__
Simon Schricker d68175
 	unsigned int is_webcam:1;
Simon Schricker d68175
 	unsigned int has_msp34xx:1;
Simon Schricker d68175
+	enum em28xx_amux amux_map[MAX_EM28XX_INPUT];
Simon Schricker d68175
 #endif
Simon Schricker d68175
 };
Simon Schricker d68175