diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-09-04 09:56:33 -0300 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-02-10 11:04:02 +0100 |
| commit | 9865f08984e14a1cc9f40ecfd468d59c92e1f3ce (patch) | |
| tree | 0f9d98ecb696b339c0f2657f2d16dd5af602d21d | |
| parent | e3ba79c75a04914e3f398ac6bcda1b0c3b7fb787 (diff) | |
| download | linux-stable-9865f08984e14a1cc9f40ecfd468d59c92e1f3ce.tar.gz linux-stable-9865f08984e14a1cc9f40ecfd468d59c92e1f3ce.tar.bz2 linux-stable-9865f08984e14a1cc9f40ecfd468d59c92e1f3ce.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: Willy Tarreau <w@1wt.eu>
| -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 235ba657d52e..79a24efc03d6 100644 --- a/drivers/media/usb/cx231xx/cx231xx-avcore.c +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c @@ -1261,7 +1261,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) |