|
@@ -359,32 +359,6 @@ void saa7134_buffer_timeout(unsigned long data)
|
|
|
spin_unlock_irqrestore(&dev->slock,flags);
|
|
|
}
|
|
|
|
|
|
-/* resends a current buffer in queue after resume */
|
|
|
-
|
|
|
-static int saa7134_buffer_requeue(struct saa7134_dev *dev,
|
|
|
- struct saa7134_dmaqueue *q)
|
|
|
-{
|
|
|
- struct saa7134_buf *buf, *next;
|
|
|
-
|
|
|
- assert_spin_locked(&dev->slock);
|
|
|
-
|
|
|
- buf = q->curr;
|
|
|
- next = buf;
|
|
|
- dprintk("buffer_requeue\n");
|
|
|
-
|
|
|
- if (!buf)
|
|
|
- return 0;
|
|
|
-
|
|
|
- dprintk("buffer_requeue : resending active buffers \n");
|
|
|
-
|
|
|
- if (!list_empty(&q->queue))
|
|
|
- next = list_entry(q->queue.next, struct saa7134_buf,
|
|
|
- vb.queue);
|
|
|
- buf->activate(dev, buf, next);
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
/* ------------------------------------------------------------------ */
|
|
|
|
|
|
int saa7134_set_dmabits(struct saa7134_dev *dev)
|
|
@@ -1139,6 +1113,32 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
+
|
|
|
+/* resends a current buffer in queue after resume */
|
|
|
+static int saa7134_buffer_requeue(struct saa7134_dev *dev,
|
|
|
+ struct saa7134_dmaqueue *q)
|
|
|
+{
|
|
|
+ struct saa7134_buf *buf, *next;
|
|
|
+
|
|
|
+ assert_spin_locked(&dev->slock);
|
|
|
+
|
|
|
+ buf = q->curr;
|
|
|
+ next = buf;
|
|
|
+ dprintk("buffer_requeue\n");
|
|
|
+
|
|
|
+ if (!buf)
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ dprintk("buffer_requeue : resending active buffers \n");
|
|
|
+
|
|
|
+ if (!list_empty(&q->queue))
|
|
|
+ next = list_entry(q->queue.next, struct saa7134_buf,
|
|
|
+ vb.queue);
|
|
|
+ buf->activate(dev, buf, next);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
|
|
|
{
|
|
|
|