From: Nils Rothaug <nils.rothaug@gmx.de>
Date: Sun, 23 Jun 2024 10:46:47 +0000 (+0200)
Subject: media: em28xx: Set GPIOs for non-audio boards when switching input
X-Git-Tag: v6.11-rc1~142^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=361e2ff5cefe10da266ced01845ab0b08112a1fd;p=thirdparty%2Fkernel%2Flinux.git

media: em28xx: Set GPIOs for non-audio boards when switching input

Fixes changing the Line Out audio source with the video input
on MyGica UTV3 board. Previously, GPIOs were only set in
em28xx_set_audio_source(), which only boards with USB audio
support reach.

Signed-off-by: Nils Rothaug <nils.rothaug@gmx.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---

diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 61d7bf701d57e..29a7f3f19b56e 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -416,8 +416,9 @@ int em28xx_audio_analog_set(struct em28xx *dev)
 	int ret, i;
 	u8 xclk;
 
+	/* Set GPIOs here for boards without audio */
 	if (dev->int_audio_type == EM28XX_INT_AUDIO_NONE)
-		return 0;
+		return em28xx_gpio_set(dev, INPUT(dev->ctl_input)->gpio);
 
 	/*
 	 * It is assumed that all devices use master volume for output.