---

yaml --- r: 357384 b: refs/heads/master c: 5d97046 h: refs/heads/master v: v3
git-mirror · Feb 5, 2013 · 4e1ea38 · 4e1ea38
1 parent 31db925
commit 4e1ea38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9f1fbcd0e9b7ab96876a9e53cbea4d2e279e82c
+refs/heads/master: 5d97046a371a44010bbfd18a75c2b107da30a606
diff --git a/trunk/drivers/media/platform/davinci/vpbe.c b/trunk/drivers/media/platform/davinci/vpbe.c
@@ -631,8 +631,10 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
 
 	err = bus_for_each_dev(&platform_bus_type, NULL, vpbe_dev,
 			       platform_device_get);
-	if (err < 0)
-		return err;
+	if (err < 0) {
+		ret = err;
+		goto fail_dev_unregister;
+	}
 
 	vpbe_dev->venc = venc_sub_dev_init(&vpbe_dev->v4l2_dev,
 					   vpbe_dev->cfg->venc.module_name);