From 42dd92758db3261aba3da6f42db85857b459335c Mon Sep 17 00:00:00 2001
From: Michael Hunold <devnull@localhost>
Date: Thu, 9 Oct 2003 10:06:10 +0000
Subject: - 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

---
 linux/drivers/media/dvb/ttpci/av7110.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'linux/drivers/media/dvb/ttpci/av7110.c')

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;
 }
 
 
-- 
cgit v1.2.3