aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/mantis/mantis_cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_cards.c')
-rw-r--r--drivers/media/dvb/mantis/mantis_cards.c11
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] = {
50 "RACK" 50 "RACK"
51}; 51};
52 52
53
54static irqreturn_t mantis_irq_handler(int irq, void *dev_id) 53static irqreturn_t mantis_irq_handler(int irq, void *dev_id)
55{ 54{
56 u32 stat = 0, mask = 0, lstat = 0, mstat = 0; 55 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
199 198
200 return err; 199 return err;
201 200
201fail7:
202 dprintk(MANTIS_ERROR, 1, "ERROR: Mantis UART exit! <%d>", err);
203 mantis_uart_exit(mantis);
204
205fail6:
206 dprintk(MANTIS_ERROR, 1, "ERROR: Mantis CA exit! <%d>", err);
207 mantis_ca_exit(mantis);
208
202fail5: 209fail5:
203 dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err); 210 dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB exit! <%d>", err);
204 mantis_dvb_exit(mantis); 211 mantis_dvb_exit(mantis);
@@ -228,8 +235,6 @@ static void __devexit mantis_pci_remove(struct pci_dev *pdev)
228 struct mantis_pci *mantis = pci_get_drvdata(pdev); 235 struct mantis_pci *mantis = pci_get_drvdata(pdev);
229 236
230 if (mantis) { 237 if (mantis) {
231 mantis_uart_exit(mantis);
232// mantis_ca_exit(mantis);
233 mantis_dvb_exit(mantis); 238 mantis_dvb_exit(mantis);
234 mantis_dma_exit(mantis); 239 mantis_dma_exit(mantis);
235 mantis_i2c_exit(mantis); 240 mantis_i2c_exit(mantis);