From 74d44091557b5b7b1998b63bcf9d4fcecad1495b Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Thu, 17 Jan 2008 12:52:05 -0800 Subject: [PATCH] --- yaml --- r: 75535 b: refs/heads/master c: a3c53e2310192e63e49610ffcb6a36b2a706fa3e h: refs/heads/master i: 75533: 6501d44ee8c3193da491c662f450613647c8b218 75531: 982818e03d54dcc2729bf73d4fc687b322b78e17 75527: c8033b9e1ab135d12e8b123d3952e64e998474e4 75519: b8e1b9d14d6275e6a1db501b88abc908d192d415 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fe27b06b8f2d..de74e5a05f8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 784680336b616dcc4c17cbd25add3b49c555cdeb +refs/heads/master: a3c53e2310192e63e49610ffcb6a36b2a706fa3e diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index 4fd187ac9d70..4f0a9157ecb1 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/drivers/media/video/saa7134/saa7134-core.c @@ -1202,9 +1202,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_restore_state(pci_dev); pci_set_power_state(pci_dev, PCI_D0);