From patchwork Fri Dec 20 22:23:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 21272 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Vu8Ue-0001uM-UX; Fri, 20 Dec 2013 23:24:28 +0100 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-6) with esmtp id 1Vu8Ud-0002AQ-3L; Fri, 20 Dec 2013 23:24:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753848Ab3LTWYY (ORCPT + 1 other); Fri, 20 Dec 2013 17:24:24 -0500 Received: from mail-we0-f179.google.com ([74.125.82.179]:42435 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752636Ab3LTWYW (ORCPT ); Fri, 20 Dec 2013 17:24:22 -0500 Received: by mail-we0-f179.google.com with SMTP id q59so3043553wes.38 for ; Fri, 20 Dec 2013 14:24:20 -0800 (PST) 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=zKrDer2IF7ltfU/vL/gqgOSZXAY++4K2HR73rnD9Etw=; b=w8J/HjqCbdQ1bxWIPYF/kfJcrNDcG38mo25iT9NR5YOwrXfGw4Zx0Fv+MDSvDh2S1g 9P4XoMex5cTwogX01cA5DO8f+IYsxfad5F7jwUi/8347A0DCKUOV/A8fTwydQ4x6Lkdj JtZb2ejuFRDxAhybwZ2dv9ogfxsXMPItif3+rbmwkGZiaP5enpsRgbt0psZ3HYzyTvcs sjLEwHBMmbAzSg8iBBbKLPHvzi+fw/xdFiTZTOBxYrjq8eU7IUdqdFLPDSaZH1yI8i9Q SoqPCTDCT12hZGSLEVdXqCxbQ+oOcVlrlGM77xy1k+dh6U+FaOpX5OlqkLPhypA82gel NAfQ== X-Received: by 10.180.228.132 with SMTP id si4mr9832877wic.2.1387578260888; Fri, 20 Dec 2013 14:24:20 -0800 (PST) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id xl18sm19612162wib.9.2013.12.20.14.24.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 20 Dec 2013 14:24:20 -0800 (PST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH 4/6] exynos4-is: Correct clean up sequence on error path in fimc_is_probe() Date: Fri, 20 Dec 2013 23:23:25 +0100 Message-Id: <1387578207-17625-5-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1387578207-17625-1-git-send-email-s.nawrocki@samsung.com> References: <1387578207-17625-1-git-send-email-s.nawrocki@samsung.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: 2013.12.20.221514 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, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' The memory allocator is being initialized before registering the subdevs so reverse the cleanup sequence to avoid trying unregister not registered subdevs. Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/exynos4-is/fimc-is.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 9770fa9..8cb70c2 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -867,10 +867,10 @@ static int fimc_is_probe(struct platform_device *pdev) err_dfs: fimc_is_debugfs_remove(is); -err_vb: - vb2_dma_contig_cleanup_ctx(is->alloc_ctx); err_sd: fimc_is_unregister_subdevs(is); +err_vb: + vb2_dma_contig_cleanup_ctx(is->alloc_ctx); err_irq: free_irq(is->irq, is); err_clk: