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

Commit 08adb9e2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: some error treatment implemented at resume functions. 



- Some error treatment implemented at resume functions.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4c93b07a

drivers/media/video/bttv-driver.c

+16 −2
Original line number Diff line number Diff line
@@ -4111,15 +4111,29 @@ static int bttv_resume(struct pci_dev *pci_dev) 
{

        struct bttv *btv = pci_get_drvdata(pci_dev);

	unsigned long flags;

	int err;



	dprintk("bttv%d: resume\n", btv->c.nr);



	/* restore pci state */

	if (btv->state.disabled) {

		pci_enable_device(pci_dev);

		err=pci_enable_device(pci_dev);

		if (err) {

			printk(KERN_WARNING "bttv%d: Can't enable device.\n",

								btv->c.nr);

			return err;

		}

		btv->state.disabled = 0;

	}

	pci_set_power_state(pci_dev, PCI_D0);

	err=pci_set_power_state(pci_dev, PCI_D0);

	if (err) {

		pci_disable_device(pci_dev);

		printk(KERN_WARNING "bttv%d: Can't enable device.\n",

							btv->c.nr);

		btv->state.disabled = 1;

		return err;

	}



	pci_restore_state(pci_dev);



	/* restore bt878 state */

drivers/media/video/cx88/cx88-mpeg.c

+17 −3
Original line number Diff line number Diff line
@@ -457,12 +457,26 @@ int cx8802_resume_common(struct pci_dev *pci_dev) 
{

	struct cx8802_dev *dev = pci_get_drvdata(pci_dev);

	struct cx88_core *core = dev->core;

	int err;



	if (dev->state.disabled) {

		pci_enable_device(pci_dev);

		err=pci_enable_device(pci_dev);

		if (err) {

			printk(KERN_ERR "%s: can't enable device\n",

					       dev->core->name);

			return err;

		}

		dev->state.disabled = 0;

	}

	pci_set_power_state(pci_dev, PCI_D0);

	err=pci_set_power_state(pci_dev, PCI_D0);

	if (err) {

		printk(KERN_ERR "%s: can't enable device\n",

					       dev->core->name);

		pci_disable_device(pci_dev);

		dev->state.disabled = 1;



		return err;

	}

	pci_restore_state(pci_dev);



	/* FIXME: re-initialize hardware */

drivers/media/video/cx88/cx88-video.c

+18 −2
Original line number Diff line number Diff line
@@ -2005,12 +2005,28 @@ static int cx8800_resume(struct pci_dev *pci_dev) 
{

	struct cx8800_dev *dev = pci_get_drvdata(pci_dev);

	struct cx88_core *core = dev->core;

	int err;



	if (dev->state.disabled) {

		pci_enable_device(pci_dev);

		err=pci_enable_device(pci_dev);

		if (err) {

			printk(KERN_ERR "%s: can't enable device\n",

						       core->name);

			return err;

		}



		dev->state.disabled = 0;

	}

	pci_set_power_state(pci_dev, PCI_D0);

	err= pci_set_power_state(pci_dev, PCI_D0);

	if (err) {

		printk(KERN_ERR "%s: can't enable device\n",

				       core->name);



		pci_disable_device(pci_dev);

		dev->state.disabled = 1;



		return err;

	}

	pci_restore_state(pci_dev);



	/* FIXME: re-initialize hardware */