diff options
Diffstat (limited to 'drivers/media/pci/mantis/hopper_cards.c')
| -rw-r--r-- | drivers/media/pci/mantis/hopper_cards.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/pci/mantis/hopper_cards.c b/drivers/media/pci/mantis/hopper_cards.c index 97b7a3220dbd..68b5800030b7 100644 --- a/drivers/media/pci/mantis/hopper_cards.c +++ b/drivers/media/pci/mantis/hopper_cards.c @@ -107,7 +107,8 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id) if (stat & MANTIS_INT_IRQ1) { dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]); spin_lock(&mantis->intmask_lock); - mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1, MANTIS_INT_MASK); + mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1, + MANTIS_INT_MASK); spin_unlock(&mantis->intmask_lock); schedule_work(&mantis->uart_work); } @@ -169,7 +170,7 @@ static int hopper_pci_probe(struct pci_dev *pdev, goto fail0; } - drvdata = (struct mantis_pci_drvdata *) pci_id->driver_data; + drvdata = (void *)pci_id->driver_data; mantis->num = devs; mantis->verbose = verbose; mantis->pdev = pdev; @@ -256,7 +257,7 @@ static void hopper_pci_remove(struct pci_dev *pdev) static struct pci_device_id hopper_pci_table[] = { MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3028_DVB_T, &vp3028_config, - NULL), + NULL), { } }; |