From patchwork Mon Oct 22 05:36:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 15106 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TQAgT-0003AQ-9k for patchwork@linuxtv.org; Mon, 22 Oct 2012 07:36:17 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for id 1TQAgS-00038c-Au; Mon, 22 Oct 2012 07:36:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753964Ab2JVFgO (ORCPT ); Mon, 22 Oct 2012 01:36:14 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:54468 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753117Ab2JVFgN (ORCPT ); Mon, 22 Oct 2012 01:36:13 -0400 Received: by mail-qa0-f46.google.com with SMTP id c26so1016222qad.19 for ; Sun, 21 Oct 2012 22:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=nUH03gHZXdnClZzs8fgzDGy+cH+PKOpSnj3r7pSdTWU=; b=QnjT9glo2FWpviPtHu0qrmp69wIe0vOzed6sjSovdDFO+b30zntf7DR/yeIIE9QjB/ SiveGoh9HcAH3rReLDb7mMQ1scGo2RD+xaRNSBxuZBhf6+ydwzWdeGBu8sCO8Hl5yrVe H7/ajw50bVv5q8uEGEAyb4hI+1AZju1rVHyhdRmjSHm9TBKjELCdhJJG3lsiPipzlUhq uWNyyYPGHtP9RkQj4PmIJqPQD7WWSqJwcZccDijc7Z2Q3kquGl7yxWj+f+72aE0HWqlu zAB9aZduRqfO75HG//CnLz/4pR68HV5qhd25u/dw6O2UX2OcpI6ApZxYUWeHiV2bYz/N c1FA== MIME-Version: 1.0 Received: by 10.49.60.231 with SMTP id k7mr4339281qer.25.1350884173141; Sun, 21 Oct 2012 22:36:13 -0700 (PDT) Received: by 10.229.134.205 with HTTP; Sun, 21 Oct 2012 22:36:13 -0700 (PDT) Date: Mon, 22 Oct 2012 13:36:13 +0800 Message-ID: Subject: [PATCH] [media] davinci: vpbe: fix missing unlock on error in vpbe_initialize() From: Wei Yongjun To: mchehab@infradead.org Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.22.53018 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1100_1199 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __C230066_P3_4 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Wei Yongjun Add the missing unlock on the error handling path in function vpbe_initialize(). Signed-off-by: Wei Yongjun Acked-by: Prabhakar Lad --- no test --- drivers/media/platform/davinci/vpbe.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index 69d7a58..875e63d 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c @@ -632,8 +632,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);