diff options
| author | Michael Hunold <devnull@localhost> | 2003-10-09 10:06:10 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-10-09 10:06:10 +0000 |
| commit | 42dd92758db3261aba3da6f42db85857b459335c (patch) | |
| tree | ae8a70a2d3bb32574c62da47f967e50f78c7863b /linux/drivers/media/dvb/ttpci/av7110.c | |
| parent | 9347dffcaf23cf01055c0d6020787336aa546bef (diff) | |
| download | mediapointer-dvb-s2-42dd92758db3261aba3da6f42db85857b459335c.tar.gz mediapointer-dvb-s2-42dd92758db3261aba3da6f42db85857b459335c.tar.bz2 | |
- backfeed patches from 2.6.0-test7, which have not gone through our cvs:
- janitorial fixes (mostly return code handling)
- spelling fixes in Kconfig files
- line breaks to re-formatting
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 9dad1f0b9..7f3f1afea 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -4995,12 +4995,19 @@ static struct saa7146_extension av7110_extension = { static int __init av7110_init(void) { - if (saa7146_register_extension(&av7110_extension)) - return -ENODEV; + int retval; + retval = saa7146_register_extension(&av7110_extension); + if (retval) + goto failed_saa7146_register; - av7110_ir_init(); - + retval = av7110_ir_init(); + if (retval) + goto failed_av7110_ir_init; return 0; +failed_av7110_ir_init: + saa7146_unregister_extension(&av7110_extension); +failed_saa7146_register: + return retval; } |