diff options
| author | Manu Abraham | 2009-12-12 00:41:07 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-01-17 14:55:44 +0100 |
| commit | a1497357dce240880d984f4b657b54245f739dbc (patch) | |
| tree | 1c041b7b1859f18a964228e099e58a01f2d0c113 /drivers/media/dvb/mantis/mantis_cards.c | |
| parent | V4L/DVB (13805): Fix: Unregister the frontend before detaching (diff) | |
| download | kernel-qcow2-linux-a1497357dce240880d984f4b657b54245f739dbc.tar.gz kernel-qcow2-linux-a1497357dce240880d984f4b657b54245f739dbc.tar.xz kernel-qcow2-linux-a1497357dce240880d984f4b657b54245f739dbc.zip | |
V4L/DVB (13806): Register and Initialize Remote control
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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c index 0b52f996f8e1..f3fefbbc876f 100644 --- a/drivers/media/dvb/mantis/mantis_cards.c +++ b/drivers/media/dvb/mantis/mantis_cards.c @@ -194,9 +194,21 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_dev dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB initialization failed <%d>", err); goto fail4; } + err = mantis_uart_init(mantis); + if (err < 0) { + dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART initialization failed <%d>", err); + goto fail6; + } + devs++; return err; + + + dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART exit! <%d>", err); + mantis_uart_exit(mantis); + +fail6: fail4: dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DMA exit! <%d>", err); mantis_dma_exit(mantis); @@ -222,6 +234,8 @@ 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_dvb_exit(mantis); mantis_dma_exit(mantis); mantis_i2c_exit(mantis); |