1 files changed, 10 insertions, 11 deletions

diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c
index e6ae35df2..37b9a5076 100644
--- a/linux/drivers/media/video/v4l2-dev.c
+++ b/linux/drivers/media/video/v4l2-dev.c
@@ -44,6 +44,7 @@ static ssize_t show_index(struct device *cd,
 			 struct device_attribute *attr, char *buf)
 {
 	struct video_device *vfd = container_of(cd, struct video_device, dev);
+
 	return sprintf(buf, "%i\n", vfd->index);
 }
 
@@ -51,6 +52,7 @@ static ssize_t show_name(struct device *cd,
 			 struct device_attribute *attr, char *buf)
 {
 	struct video_device *vfd = container_of(cd, struct video_device, dev);
+
 	return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
@@ -63,12 +65,14 @@ static struct device_attribute video_device_attrs[] = {
 static ssize_t show_index(struct class_device *cd, char *buf)
 {
 	struct video_device *vfd = container_of(cd, struct video_device, dev);
+
 	return sprintf(buf, "%i\n", vfd->index);
 }
 
 static ssize_t show_name(struct class_device *cd, char *buf)
 {
 	struct video_device *vfd = container_of(cd, struct video_device, dev);
+
 	return sprintf(buf, "%.*s\n", (int)sizeof(vfd->name), vfd->name);
 }
 
@@ -78,10 +82,7 @@ static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
 
 struct video_device *video_device_alloc(void)
 {
-	struct video_device *vfd;
-
-	vfd = kzalloc(sizeof(*vfd), GFP_KERNEL);
-	return vfd;
+	return kzalloc(sizeof(struct video_device), GFP_KERNEL);
 }
 EXPORT_SYMBOL(video_device_alloc);
 
@@ -298,7 +299,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 
 	/* pick a minor number */
 	mutex_lock(&videodev_lock);
-	if (nr >= 0  &&  nr < end-base) {
+	if (nr >= 0 && nr < end-base) {
 		/* use the one the driver asked for */
 		i = base + nr;
 		if (NULL != video_device[i]) {
@@ -330,7 +331,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 	}
 
 	/* sysfs class */
-	memset(&vfd->dev, 0x00, sizeof(vfd->dev));
+	memset(&vfd->dev, 0, sizeof(vfd->dev));
 	vfd->dev.class = &video_class;
 	vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
@@ -349,16 +350,14 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 		goto fail_minor;
 	}
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
-	ret = class_device_create_file(&vfd->dev,
-			&class_device_attr_name);
+	ret = class_device_create_file(&vfd->dev, &class_device_attr_name);
 	if (ret < 0) {
 		printk(KERN_ERR "%s: class_device_create_file 'name' failed\n",
 				__func__);
 		class_device_unregister(&vfd->dev);
 		goto fail_minor;
 	}
-	ret = class_device_create_file(&vfd->dev,
-			&class_device_attr_index);
+	ret = class_device_create_file(&vfd->dev, &class_device_attr_index);
 	if (ret < 0) {
 		printk(KERN_ERR "%s: class_device_create_file 'index' failed\n",
 				__func__);
@@ -372,8 +371,8 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
 fail_minor:
 	mutex_lock(&videodev_lock);
 	video_device[vfd->minor] = NULL;
-	vfd->minor = -1;
 	mutex_unlock(&videodev_lock);
+	vfd->minor = -1;
 	return ret;
 }
 EXPORT_SYMBOL(video_register_device_index);