summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-07-12 16:55:46 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 20:23:12 -0300
commitc1af23c4f7e4c95f0002b6801a9dd82b22cae35d (patch)
tree6a5d3ecc55ee909f9683024e173f522c1d1e6640 /drivers/media
parente0a9b1770bac048171961625875aaf15118a7ae9 (diff)
downloadblackbird-op-linux-c1af23c4f7e4c95f0002b6801a9dd82b22cae35d.tar.gz
blackbird-op-linux-c1af23c4f7e4c95f0002b6801a9dd82b22cae35d.zip
[media] radio-si470x: restore ctrl settings after suspend/resume
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/radio/si470x/radio-si470x-usb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 40b963c983c6..0204cf445387 100644
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -792,11 +792,16 @@ static int si470x_usb_driver_suspend(struct usb_interface *intf,
static int si470x_usb_driver_resume(struct usb_interface *intf)
{
struct si470x_device *radio = usb_get_intfdata(intf);
+ int ret;
dev_info(&intf->dev, "resuming now...\n");
/* start radio */
- return si470x_start_usb(radio);
+ ret = si470x_start_usb(radio);
+ if (ret == 0)
+ v4l2_ctrl_handler_setup(&radio->hdl);
+
+ return ret;
}
OpenPOWER on IntegriCloud