From: Gerd Knorr <kraxel@bytesex.org>
Date: Sun, 1 May 2005 15:59:19 +0000 (-0700)
Subject: [PATCH] cx88-dvb oops fix
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1622c3fcf4c1c6c8267938f366ecd2a348d67d93;p=mv-sheeva.git

[PATCH] cx88-dvb oops fix

Fixup error path, without that one the driver kills the machine by oopsing
in the IRQ handler in case the frontend initialization fails.

Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index bc6f18c4535..84d17435f50 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -243,10 +243,8 @@ static int dvb_register(struct cx8802_dev *dev)
 		break;
 #endif
 	default:
-		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n"
-		       "%s: you might want to look out for patches here:\n"
-		       "%s:     http://dl.bytesex.org/patches/\n",
-		       dev->core->name, dev->core->name, dev->core->name);
+		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
+		       dev->core->name);
 		break;
 	}
 	if (NULL == dev->dvb.frontend) {
@@ -308,9 +306,11 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev,
 			    dev);
 	err = dvb_register(dev);
 	if (0 != err)
-		goto fail_free;
+		goto fail_fini;
 	return 0;
 
+ fail_fini:
+	cx8802_fini_common(dev);
  fail_free:
 	kfree(dev);
  fail_core: