# HG changeset patch
# User Trent Piepho <xyzzy@speakeasy.org>
# Node ID b900796fdfb4bc87642c470515f88ed7ae92ced3
# Parent  e33331856212e707150dc85fda486240eb7feae0
Handle class_device_create_file errors

From: Trent Piepho <xyzzy@speakeasy.org>

Add proper error checking and roll-back for failure of
class_device_create_file() in videodev.c.  Print error messages and
unroll partially created sysfs entries.

Also, failure of class_device_register() in video_register_device() is
handled correctly.  It was failing to de-allocate the minor number.  This
must be done in video_register_device(), since the caller has no way of
knowing if failure occurred before or after the class device was
registered.

Also added an error message if video_register_device() is called with
an unknown type, which should never happen.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>

diff -r e33331856212 -r b900796fdfb4 linux/drivers/media/video/videodev.c
--- a/linux/drivers/media/video/videodev.c	Sun Jul 23 18:36:01 2006 -0700
+++ b/linux/drivers/media/video/videodev.c	Sun Jul 23 19:08:21 2006 -0700
@@ -1557,6 +1557,8 @@ int video_register_device(struct video_d
 			name_base = "radio";
 			break;
 		default:
+			printk(KERN_ERR "%s called with unknown type: %d\n",
+			       __FUNCTION__, type);
 			return -1;
 	}
 
@@ -1597,18 +1599,20 @@ int video_register_device(struct video_d
 	if (ret) {
 		printk(KERN_ERR "%s: class_device_register failed\n",
 		       __FUNCTION__);
-		return ret;
-	}
-        ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name);
-        if (ret < 0) {
-                printk(KERN_WARNING "%s error: %d\n", __FUNCTION__, ret);
-		return ret;
+		goto fail_minor;
+	}
+	ret = class_device_create_file(&vfd->class_dev, &class_device_attr_name);
+	if (ret) {
+		printk(KERN_ERR "%s: class_device_create_file 'name' failed\n",
+		       __FUNCTION__);
+		goto fail_classdev;
 	}
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
-        ret = class_device_create_file(&vfd->class_dev, &class_device_attr_dev);
-        if (ret < 0) {
-                printk(KERN_WARNING "%s error: %d\n", __FUNCTION__, ret);
-		return ret;
+	ret = class_device_create_file(&vfd->class_dev, &class_device_attr_dev);
+	if (ret) {
+		printk(KERN_ERR "%s: class_device_create_file 'dev' failed\n",
+		       __FUNCTION__);
+		goto fail_classdev;
 	}
 #endif
 
@@ -1620,6 +1624,15 @@ int video_register_device(struct video_d
 		       "http://lwn.net/Articles/36850/\n", vfd->name);
 #endif
 	return 0;
+
+fail_classdev:
+	class_device_unregister(&vfd->class_dev);
+fail_minor:
+	mutex_lock(&videodev_lock);
+	video_device[vfd->minor] = NULL;
+	vfd->minor = -1;
+	mutex_unlock(&videodev_lock);
+	return ret;
 }
 
 /**