From patchwork Sat Oct 4 19:40:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 26329 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XaVCy-0007h7-FN; Sat, 04 Oct 2014 21:41:36 +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.72/mailfrontend-5) with esmtp id 1XaVCw-0005aD-7C; Sat, 04 Oct 2014 21:41:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751139AbaJDTlb (ORCPT + 1 other); Sat, 4 Oct 2014 15:41:31 -0400 Received: from mail-qg0-f54.google.com ([209.85.192.54]:62441 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbaJDTlX (ORCPT ); Sat, 4 Oct 2014 15:41:23 -0400 Received: by mail-qg0-f54.google.com with SMTP id z107so2248489qgd.41 for ; Sat, 04 Oct 2014 12:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pDzsqVxpQI1q7Mj0NvW3HOB5ZhNEU8OHv+3hiMVgUFU=; b=0m9xKZ+qFN/HzHuXnZQWY5an3PaAqcqQreS44gxFbMY6nwJeAMB/8Ge6Zw+nkJF6zQ YCTa/uXG0ROIh9Pt4H1ca76uj4gO0wpjgc1MSyrKGg6bZXtfS1+llluvkiEvgEPiz+40 flBGQq9VnGljRD7WHAcjmHKYRvB+RKbh5+qnfzo1Lk3vpJ8f+hTnXSh4gEw4U/P3EV4N 8bMCOTZywCcik5K7bbEXgJmFKwC1/F7foo7VPsn2UOYyWzCoNoa2rJMru+KgVsuYwoPB R55Q5emu+fkwy39VPJj64BDZFv8nuCZpsYMNEIoqdxhpVf8utT6h5IwySroXGQpEmlps MTTg== X-Received: by 10.224.79.67 with SMTP id o3mr4801809qak.103.1412451682293; Sat, 04 Oct 2014 12:41:22 -0700 (PDT) Received: from localhost.localdomain ([187.66.157.233]) by mx.google.com with ESMTPSA id q20sm8754229qay.37.2014.10.04.12.41.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Oct 2014 12:41:21 -0700 (PDT) From: Fabio Estevam To: m.chehab@samsung.com Cc: p.zabel@pengutronix.de, linux-media@vger.kernel.org, Fabio Estevam Subject: [PATCH 2/3] [media] coda: Unregister v4l2 upon alloc_workqueue() error Date: Sat, 4 Oct 2014 16:40:51 -0300 Message-Id: <1412451652-27220-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412451652-27220-1-git-send-email-festevam@gmail.com> References: <1412451652-27220-1-git-send-email-festevam@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.10.4.193319 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' 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_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Fabio Estevam If alloc_workqueue() fails, we should go to the 'err_v4l2_register' label, which will unregister the v4l2 device. Signed-off-by: Fabio Estevam Acked-by: Philipp Zabel --- drivers/media/platform/coda/coda-common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 7cd82e8..951f1d4 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -1971,7 +1971,8 @@ static int coda_probe(struct platform_device *pdev) dev->workqueue = alloc_workqueue("coda", WQ_UNBOUND | WQ_MEM_RECLAIM, 1); if (!dev->workqueue) { dev_err(&pdev->dev, "unable to alloc workqueue\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err_v4l2_register; } platform_set_drvdata(pdev, dev);