- 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

9 files changed, 21 insertions, 22 deletions

diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index 4ead55c0f..1f1f25c1c 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -19,7 +19,7 @@ config VIDEO_DEV
 
 	  Documentation for the original API is included in the file
 	  Documentation/video4linux/API.html.  Documentation for V4L2 is
-	  available on the web at http://bytesex.org/v4l/
+	  available on the web at <http://bytesex.org/v4l/>.
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called videodev.
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c
index 067a27c82..d5f02eca5 100644
--- a/linux/drivers/media/common/saa7146_fops.c
+++ b/linux/drivers/media/common/saa7146_fops.c
@@ -163,7 +163,7 @@ void saa7146_buffer_timeout(unsigned long data)
 
 static int fops_open(struct inode *inode, struct file *file)
 {
-	unsigned int minor = minor(inode->i_rdev);
+	unsigned int minor = iminor(inode);
 	struct saa7146_dev *h = NULL, *dev = NULL;
 	struct list_head *list;
 	struct saa7146_fh *fh = NULL;
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 096310670..7b04748c0 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1219,7 +1219,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 
 		q = &fh->video_q;
 		down(&q->lock);
-		err = videobuf_mmap_setup(file,q,gbuffers,gbufsize, V4L2_MEMORY_MMAP);
+		err = videobuf_mmap_setup(file,q,gbuffers,gbufsize,
+					  V4L2_MEMORY_MMAP);
 		if (err < 0) {
 			up(&q->lock);
 			return err;
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);
 }
 
 
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 5d2df02a6..0e22927c0 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1056,7 +1056,8 @@ static ssize_t stc_read(struct file *file, char *buf, size_t count,
 	if (tc < 0)
 		return 0;
 
-	copy_to_user(buf, stc_firmware + *offset, tc);
+	if (copy_to_user(buf, stc_firmware + *offset, tc))
+		return -EFAULT;
 
 	*offset += tc;
 
diff --git a/linux/drivers/media/dvb/ttusb-dec/Kconfig b/linux/drivers/media/dvb/ttusb-dec/Kconfig
index aad5cc65d..afcaf2923 100644
--- a/linux/drivers/media/dvb/ttusb-dec/Kconfig
+++ b/linux/drivers/media/dvb/ttusb-dec/Kconfig
@@ -1,7 +1,6 @@
 config DVB_TTUSB_DEC
 	tristate "Technotrend/Hauppauge USB DEC2000-T devices"
-	depends on DVB_CORE
-	depends on !STANDALONE
+	depends on DVB_CORE && USB && !STANDALONE
 	help
 	  Support for external USB adapters designed by Technotrend and
 	  produced by Hauppauge, shipped under the brand name 'DEC2000-T'.