summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-21 02:57:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:38 -0300
commit18cfe03d320b3b36e60145c5896afd5d911f63b2 (patch)
treedeac7e5c6f16f84cb4ac4b3f95676e3c641ca3df /drivers/media
parent12042b0593104ba0c0c8030b89c837e9262dc906 (diff)
downloadtalos-op-linux-18cfe03d320b3b36e60145c5896afd5d911f63b2.tar.gz
talos-op-linux-18cfe03d320b3b36e60145c5896afd5d911f63b2.zip
[media] dvb_usb_v2: fix power_ctrl() callback error handling
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_core.c b/drivers/media/dvb/dvb-usb/dvb_usb_core.c
index 81ee3fc09a48..93ce02a91189 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_core.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_core.c
@@ -455,7 +455,8 @@ int dvb_usbv2_device_power_ctrl(struct dvb_usb_device *d, int onoff)
pr_debug("%s: power control=%d\n", __func__, onoff);
if (d->props->power_ctrl) {
ret = d->props->power_ctrl(d, onoff);
- goto err;
+ if (ret < 0)
+ goto err;
}
}
OpenPOWER on IntegriCloud