diff options
author | Gerd Knorr <kraxel@bytesex.org> | 2005-05-01 11:59:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:19 -0400 |
commit | 1622c3fcf4c1c6c8267938f366ecd2a348d67d93 (patch) | |
tree | 1a2cf22e71f88acbb9fdc0a1066be74064550ac1 /drivers/media/video/cx88/cx88-dvb.c | |
parent | f8e08a8466c4ac5f61b4bdb6338fd97eedb9c9e8 (diff) |
[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>
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 10 |
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 bc6f18c45357..84d17435f503 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) | |||
243 | break; | 243 | break; |
244 | #endif | 244 | #endif |
245 | default: | 245 | default: |
246 | printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n" | 246 | printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", |
247 | "%s: you might want to look out for patches here:\n" | 247 | dev->core->name); |
248 | "%s: http://dl.bytesex.org/patches/\n", | ||
249 | dev->core->name, dev->core->name, dev->core->name); | ||
250 | break; | 248 | break; |
251 | } | 249 | } |
252 | if (NULL == dev->dvb.frontend) { | 250 | if (NULL == dev->dvb.frontend) { |
@@ -308,9 +306,11 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev, | |||
308 | dev); | 306 | dev); |
309 | err = dvb_register(dev); | 307 | err = dvb_register(dev); |
310 | if (0 != err) | 308 | if (0 != err) |
311 | goto fail_free; | 309 | goto fail_fini; |
312 | return 0; | 310 | return 0; |
313 | 311 | ||
312 | fail_fini: | ||
313 | cx8802_fini_common(dev); | ||
314 | fail_free: | 314 | fail_free: |
315 | kfree(dev); | 315 | kfree(dev); |
316 | fail_core: | 316 | fail_core: |