From 9ceb830cade6709965852a73c3dbd40031ccb067 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 12 Jul 2012 16:55:46 -0300 Subject: [PATCH] --- yaml --- r: 320664 b: refs/heads/master c: c1af23c4f7e4c95f0002b6801a9dd82b22cae35d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/radio/si470x/radio-si470x-usb.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 771fabb17dc9..29f54b9c773e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0a9b1770bac048171961625875aaf15118a7ae9 +refs/heads/master: c1af23c4f7e4c95f0002b6801a9dd82b22cae35d diff --git a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c b/trunk/drivers/media/radio/si470x/radio-si470x-usb.c index 40b963c983c6..0204cf445387 100644 --- a/trunk/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/trunk/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; }