aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Knorr <kraxel@bytesex.org>2005-05-01 08:59:19 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:19 -0700
commit1622c3fcf4c1c6c8267938f366ecd2a348d67d93 (patch)
tree1a2cf22e71f88acbb9fdc0a1066be74064550ac1
parentf8e08a8466c4ac5f61b4bdb6338fd97eedb9c9e8 (diff)
downloadkernel_samsung_aries-1622c3fcf4c1c6c8267938f366ecd2a348d67d93.zip
kernel_samsung_aries-1622c3fcf4c1c6c8267938f366ecd2a348d67d93.tar.gz
kernel_samsung_aries-1622c3fcf4c1c6c8267938f366ecd2a348d67d93.tar.bz2
[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>
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index bc6f18c..84d1743 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: