From 4e1ea3888c0e827a7f246f573f4da8fb8ce9c7b2 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 22 Oct 2012 01:36:13 -0300 Subject: [PATCH] --- yaml --- r: 357384 b: refs/heads/master c: 5d97046a371a44010bbfd18a75c2b107da30a606 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/davinci/vpbe.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bc00f49294db..9c30d5c639ec 100644 --- 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 index 4d9469733fd9..4ca0f9a2ad8a 100644 --- 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);