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

Commit 6a709749 authored by Jean-Francois Moine's avatar Jean-Francois Moine Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8718): gspca: suspend/resume added. 



Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5d05294a

drivers/media/video/gspca/conex.c

+4 −0
Original line number Diff line number Diff line
@@ -1026,6 +1026,10 @@ static struct usb_driver sd_driver = { 
	.id_table = device_table,

	.probe = sd_probe,

	.disconnect = gspca_disconnect,

#ifdef CONFIG_PM

	.suspend = gspca_suspend,

	.resume = gspca_resume,

#endif

};



/* -- module insert / remove -- */

drivers/media/video/gspca/etoms.c

+4 −0
Original line number Diff line number Diff line
@@ -926,6 +926,10 @@ static struct usb_driver sd_driver = { 
	.id_table = device_table,

	.probe = sd_probe,

	.disconnect = gspca_disconnect,

#ifdef CONFIG_PM

	.suspend = gspca_suspend,

	.resume = gspca_resume,

#endif

};



/* -- module insert / remove -- */

drivers/media/video/gspca/gspca.c

+29 −1
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ static void fill_frame(struct gspca_dev *gspca_dev, 
	cam_pkt_op pkt_scan;



	if (urb->status != 0) {

		if (!gspca_dev->frozen)

			PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);

		return;		/* disconnection ? */

	}
@@ -1808,6 +1809,33 @@ void gspca_disconnect(struct usb_interface *intf) 
}

EXPORT_SYMBOL(gspca_disconnect);



#ifdef CONFIG_PM

int gspca_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);



	if (!gspca_dev->streaming)

		return 0;

	gspca_dev->frozen = 1;		/* avoid urb error messages */

	gspca_dev->sd_desc->stopN(gspca_dev);

	destroy_urbs(gspca_dev);

	gspca_set_alt0(gspca_dev);

	gspca_dev->sd_desc->stop0(gspca_dev);

	return 0;

}

EXPORT_SYMBOL(gspca_suspend);



int gspca_resume(struct usb_interface *intf)

{

	struct gspca_dev *gspca_dev = usb_get_intfdata(intf);



	gspca_dev->frozen = 0;

	if (!gspca_dev->streaming)

		return 0;

	return gspca_init_transfer(gspca_dev);

}

EXPORT_SYMBOL(gspca_resume);

#endif

/* -- cam driver utility functions -- */



/* auto gain and exposure algorithm based on the knee algorithm described here:

drivers/media/video/gspca/gspca.h

+7 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ struct gspca_dev { 
	struct mutex queue_lock;	/* ISOC queue protection */

	__u32 sequence;			/* frame sequence number */

	char streaming;

#ifdef CONFIG_PM

	char frozen;			/* suspend - resume */

#endif

	char users;			/* number of opens */

	char present;			/* device connected */

	char nbufread;			/* number of buffers for read() */
@@ -173,6 +176,10 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, 
				    struct gspca_frame *frame,

				    const __u8 *data,

				    int len);

#ifdef CONFIG_PM

int gspca_suspend(struct usb_interface *intf, pm_message_t message);

int gspca_resume(struct usb_interface *intf);

#endif

int gspca_auto_gain_n_exposure(struct gspca_dev *gspca_dev, int avg_lum,

	int desired_avg_lum, int deadzone, int gain_knee, int exposure_knee);

#endif /* GSPCAV2_H */

drivers/media/video/gspca/mars.c

+4 −0
Original line number Diff line number Diff line
@@ -439,6 +439,10 @@ static struct usb_driver sd_driver = { 
	.id_table = device_table,

	.probe = sd_probe,

	.disconnect = gspca_disconnect,

#ifdef CONFIG_PM

	.suspend = gspca_suspend,

	.resume = gspca_resume,

#endif

};



/* -- module insert / remove -- */