From 4bc5e214cf03fa71a32e255b84cf3922fe5a2196 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Tue, 14 Aug 2012 22:21:07 -0300
Subject: [PATCH] --- yaml --- r: 330897 b: refs/heads/master c:
 15d0883663edccea29eeb9790052a11dd9977157 h: refs/heads/master i:   330895:
 0ec0753249479386a262120f664fb9b4173d330f v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h  |  2 +-
 .../media/usb/dvb-usb-v2/dvb_usb_core.c       | 42 +++++++++++++++----
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b9c91b058ba1..ea10d835123e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06bae1227aadf51d047f7a75834ed446e56ebae2
+refs/heads/master: 15d0883663edccea29eeb9790052a11dd9977157
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h
index 63fc275c6497..5a53c6231fc2 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h
+++ b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h
@@ -383,7 +383,7 @@ extern int dvb_usbv2_probe(struct usb_interface *,
 extern void dvb_usbv2_disconnect(struct usb_interface *);
 extern int dvb_usbv2_suspend(struct usb_interface *, pm_message_t);
 extern int dvb_usbv2_resume(struct usb_interface *);
-#define dvb_usbv2_reset_resume dvb_usbv2_resume
+extern int dvb_usbv2_reset_resume(struct usb_interface *);
 
 /* the generic read/write method for device control */
 extern int dvb_usbv2_generic_rw(struct dvb_usb_device *, u8 *, u16, u8 *, u16);
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index a0e70e91834a..e2d73e1a7ae0 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -952,7 +952,7 @@ EXPORT_SYMBOL(dvb_usbv2_disconnect);
 int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
 {
 	struct dvb_usb_device *d = usb_get_intfdata(intf);
-	int i, active_fe;
+	int ret = 0, i, active_fe;
 	struct dvb_frontend *fe;
 	dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
@@ -972,18 +972,17 @@ int dvb_usbv2_suspend(struct usb_interface *intf, pm_message_t msg)
 			/* stop usb streaming */
 			usb_urb_killv2(&d->adapter[i].stream);
 
-			dvb_frontend_suspend(fe);
+			ret = dvb_frontend_suspend(fe);
 		}
 	}
 
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL(dvb_usbv2_suspend);
 
-int dvb_usbv2_resume(struct usb_interface *intf)
+static int dvb_usbv2_resume_common(struct dvb_usb_device *d)
 {
-	struct dvb_usb_device *d = usb_get_intfdata(intf);
-	int i, active_fe;
+	int ret = 0, i, active_fe;
 	struct dvb_frontend *fe;
 	dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
@@ -992,7 +991,7 @@ int dvb_usbv2_resume(struct usb_interface *intf)
 		if (d->adapter[i].dvb_adap.priv && active_fe != -1) {
 			fe = d->adapter[i].fe[active_fe];
 
-			dvb_frontend_resume(fe);
+			ret = dvb_frontend_resume(fe);
 
 			/* resume usb streaming */
 			usb_urb_submitv2(&d->adapter[i].stream, NULL);
@@ -1009,10 +1008,37 @@ int dvb_usbv2_resume(struct usb_interface *intf)
 		schedule_delayed_work(&d->rc_query_work,
 				msecs_to_jiffies(d->rc.interval));
 
-	return 0;
+	return ret;
+}
+
+int dvb_usbv2_resume(struct usb_interface *intf)
+{
+	struct dvb_usb_device *d = usb_get_intfdata(intf);
+	dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+	return dvb_usbv2_resume_common(d);
 }
 EXPORT_SYMBOL(dvb_usbv2_resume);
 
+int dvb_usbv2_reset_resume(struct usb_interface *intf)
+{
+	struct dvb_usb_device *d = usb_get_intfdata(intf);
+	int ret;
+	dev_dbg(&d->udev->dev, "%s:\n", __func__);
+
+	dvb_usbv2_device_power_ctrl(d, 1);
+
+	if (d->props->init)
+		d->props->init(d);
+
+	ret = dvb_usbv2_resume_common(d);
+
+	dvb_usbv2_device_power_ctrl(d, 0);
+
+	return ret;
+}
+EXPORT_SYMBOL(dvb_usbv2_reset_resume);
+
 MODULE_VERSION("2.0");
 MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");