diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-09-04 09:56:33 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-28 03:01:30 -0400 |
| commit | 5fecc841270529852514709c091cddc8243f0c05 (patch) | |
| tree | b7bf72710a3e4463eca0c20a54c926817deda409 /drivers | |
| parent | 68bf9d10b0f0248d44e62d38d4e7a8fc5b409599 (diff) | |
| download | linux-stable-5fecc841270529852514709c091cddc8243f0c05.tar.gz linux-stable-5fecc841270529852514709c091cddc8243f0c05.tar.bz2 linux-stable-5fecc841270529852514709c091cddc8243f0c05.zip | |
cx231xx: don't return error on success
commit 1871d718a9db649b70f0929d2778dc01bc49b286 upstream.
The cx231xx_set_agc_analog_digital_mux_select() callers
expect it to return 0 or an error. Returning a positive value
makes the first attempt to switch between analog/digital to fail.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-avcore.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c index 491913778bcc..2f52d66b4dae 100644 --- a/drivers/media/usb/cx231xx/cx231xx-avcore.c +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c @@ -1264,7 +1264,10 @@ int cx231xx_set_agc_analog_digital_mux_select(struct cx231xx *dev, dev->board.agc_analog_digital_select_gpio, analog_or_digital); - return status; + if (status < 0) + return status; + + return 0; } int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3) |