diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-mpeg.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 2c4fbe9258d9..35e6d0c2b872 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -316,14 +316,14 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev) | |||
316 | spin_unlock(&dev->slock); | 316 | spin_unlock(&dev->slock); |
317 | } | 317 | } |
318 | 318 | ||
319 | /* other general errors */ | 319 | /* other general errors */ |
320 | if (status & 0x1f0100) { | 320 | if (status & 0x1f0100) { |
321 | dprintk( 0, "general errors: 0x%08x\n", status & 0x1f0100 ); | 321 | dprintk( 0, "general errors: 0x%08x\n", status & 0x1f0100 ); |
322 | spin_lock(&dev->slock); | 322 | spin_lock(&dev->slock); |
323 | cx8802_stop_dma(dev); | 323 | cx8802_stop_dma(dev); |
324 | cx8802_restart_queue(dev,&dev->mpegq); | 324 | cx8802_restart_queue(dev,&dev->mpegq); |
325 | spin_unlock(&dev->slock); | 325 | spin_unlock(&dev->slock); |
326 | } | 326 | } |
327 | } | 327 | } |
328 | 328 | ||
329 | #define MAX_IRQ_LOOP 10 | 329 | #define MAX_IRQ_LOOP 10 |
@@ -379,8 +379,8 @@ int cx8802_init_common(struct cx8802_dev *dev) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev); | 381 | pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev); |
382 | pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER, &dev->pci_lat); | 382 | pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER, &dev->pci_lat); |
383 | printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, " | 383 | printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, " |
384 | "latency: %d, mmio: 0x%lx\n", dev->core->name, | 384 | "latency: %d, mmio: 0x%lx\n", dev->core->name, |
385 | pci_name(dev->pci), dev->pci_rev, dev->pci->irq, | 385 | pci_name(dev->pci), dev->pci_rev, dev->pci->irq, |
386 | dev->pci_lat,pci_resource_start(dev->pci,0)); | 386 | dev->pci_lat,pci_resource_start(dev->pci,0)); |
@@ -430,7 +430,7 @@ void cx8802_fini_common(struct cx8802_dev *dev) | |||
430 | 430 | ||
431 | int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) | 431 | int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state) |
432 | { | 432 | { |
433 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); | 433 | struct cx8802_dev *dev = pci_get_drvdata(pci_dev); |
434 | struct cx88_core *core = dev->core; | 434 | struct cx88_core *core = dev->core; |
435 | 435 | ||
436 | /* stop mpeg dma */ | 436 | /* stop mpeg dma */ |