Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15d08836 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: .reset_resume() support 



Add .reset_resume() support.
Also some other small changes for suspend / resume.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 06bae122

drivers/media/usb/dvb-usb-v2/dvb_usb.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

+34 −8
Original line number Diff line number Diff line
@@ -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>");