diff options
| author | Manu Abraham <abraham.manu@gmail.com> | 2009-12-04 05:56:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-01-17 11:55:43 -0200 |
| commit | 3e978a8284080d801d20cda377d9cf7c12fe68b9 (patch) | |
| tree | 797536140340fc3c1b4e4968d0fdd44ddbbb2088 /drivers/media/dvb/mantis/mantis_cards.c | |
| parent | ad0ac434cb3b34640a4e81d7e80a1512c6e40253 (diff) | |
| download | linux-stable-3e978a8284080d801d20cda377d9cf7c12fe68b9.tar.gz linux-stable-3e978a8284080d801d20cda377d9cf7c12fe68b9.tar.bz2 linux-stable-3e978a8284080d801d20cda377d9cf7c12fe68b9.zip | |
V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
* Initial go at VP-3028, VP-3030 devices.
* I2C communication improvements,
* Add TDA665x support
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_cards.c')
| -rw-r--r-- | drivers/media/dvb/mantis/mantis_cards.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c index d486c7fcb453..638177ce72a2 100644 --- a/drivers/media/dvb/mantis/mantis_cards.c +++ b/drivers/media/dvb/mantis/mantis_cards.c @@ -50,7 +50,6 @@ static char *label[10] = { "RACK" }; - static irqreturn_t mantis_irq_handler(int irq, void *dev_id) { u32 stat = 0, mask = 0, lstat = 0, mstat = 0; @@ -199,6 +198,14 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_dev return err; +fail7: + dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART exit! <%d>", err); + mantis_uart_exit(mantis); + +fail6: + dprintk(MANTIS_ERROR, 1, "ERROR: Mantis CA exit! <%d>", err); + mantis_ca_exit(mantis); + fail5: dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err); mantis_dvb_exit(mantis); @@ -228,8 +235,6 @@ static void __devexit mantis_pci_remove(struct pci_dev *pdev) struct mantis_pci *mantis = pci_get_drvdata(pdev); if (mantis) { - mantis_uart_exit(mantis); -// mantis_ca_exit(mantis); mantis_dvb_exit(mantis); mantis_dma_exit(mantis); mantis_i2c_exit(mantis); |