- 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

4 files changed, 14 insertions, 16 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;
 }
 
 
diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index a87c2c1df..3f36d7c35 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -392,10 +392,7 @@ static struct saa7146_extension budget_extension = {
 
 static int __init budget_ci_init(void) 
 {
-	if (saa7146_register_extension(&budget_extension))
-		return -ENODEV;
-	
-	return 0;
+	return saa7146_register_extension(&budget_extension);
 }
 
 
diff --git a/linux/drivers/media/dvb/ttpci/budget-patch.c b/linux/drivers/media/dvb/ttpci/budget-patch.c
index 14d3e56d7..d1ea91ff4 100644
--- a/linux/drivers/media/dvb/ttpci/budget-patch.c
+++ b/linux/drivers/media/dvb/ttpci/budget-patch.c
@@ -247,10 +247,7 @@ static int budget_patch_detach (struct saa7146_dev* dev)
 
 static int __init budget_patch_init(void) 
 {
-        if (saa7146_register_extension(&budget_extension))
-                return -ENODEV;
-        
-        return 0;
+	return saa7146_register_extension(&budget_extension);
 }
 
 
diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c
index 29d2052a8..0041d94ae 100644
--- a/linux/drivers/media/dvb/ttpci/budget.c
+++ b/linux/drivers/media/dvb/ttpci/budget.c
@@ -226,10 +226,7 @@ static struct saa7146_extension budget_extension = {
 
 static int __init budget_init(void) 
 {
-	if (saa7146_register_extension(&budget_extension))
-		return -ENODEV;
-	
-	return 0;
+	return saa7146_register_extension(&budget_extension);
 }