diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-05 10:42:44 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-05 10:42:44 -0200 |
| commit | 24db565af4ebc0897b57f76e70753dbf5232e52e (patch) | |
| tree | 07eec1075a41f482b8e7c056d82b4588c0e8064b /linux/drivers/media/video/saa7134 | |
| parent | e4d2ad96d3876243a74af7ccdf5a984bebf90ea5 (diff) | |
| download | mediapointer-dvb-s2-24db565af4ebc0897b57f76e70753dbf5232e52e.tar.gz mediapointer-dvb-s2-24db565af4ebc0897b57f76e70753dbf5232e52e.tar.bz2 | |
backport commit a3c53e2310192e63e49610ffcb6a36b2a706fa3e
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Original Changelog:
Author: Daniel Walker <dwalker@mvista.com>
Date: Thu Jan 17 12:52:05 2008 -0800
fix wrong sized spinlock flags argument
Correct wrong sized spinlock flags, form int to unsigned long.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 0f9c06942..862d1f6a4 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1312,9 +1312,8 @@ static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state) static int saa7134_resume(struct pci_dev *pci_dev) { - struct saa7134_dev *dev = pci_get_drvdata(pci_dev); - unsigned int flags; + unsigned long flags; pci_set_power_state(pci_dev, PCI_D0); pci_restore_state(pci_dev); |