From patchwork Thu May 8 17:35:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 23851 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 1WiSFP-0007Tz-F1; Thu, 08 May 2014 19:36:43 +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-8) with esmtp id 1WiSFN-0003cd-kZ; Thu, 08 May 2014 19:36:43 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754885AbaEHRgD (ORCPT + 1 other); Thu, 8 May 2014 13:36:03 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:46529 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754413AbaEHRgB (ORCPT ); Thu, 8 May 2014 13:36:01 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N5900I6FNK0A880@mailout2.samsung.com>; Fri, 09 May 2014 02:36:00 +0900 (KST) X-AuditID: cbfee61a-b7f2b6d000006c4d-25-536bc0807a7e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 0B.9C.27725.080CB635; Fri, 09 May 2014 02:36:00 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N5900EYVNJBT880@mmp1.samsung.com>; Fri, 09 May 2014 02:36:00 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, kyungmin.park@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH V2 1/4] exynos4-is: Free FIMC-IS CPU memory only when allocated Date: Thu, 08 May 2014 19:35:15 +0200 Message-id: <1399570516-29782-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrFJMWRmVeSWpSXmKPExsVy+t9jAd2GA9nBBtcnCljMP3KO1eJs0xt2 i02Pr7FaXN41h82iZ8NWVovDb9pZHdg8Ni+p9+jbsorR4/MmuQDmKC6blNSczLLUIn27BK6M +T83MhU8Z694tfoISwPjBbYuRk4OCQETiSU7WlkgbDGJC/fWA8W5OIQEFjFKXGltYQRJCAl0 MEn0rQ8BsdkEDCV6j/aBxUUE5CWe9N4Aa2AWWMco8WtePzNIQljAX+LynVlgRSwCqhLvf88E inNw8Aq4Sdzd6w1iSggoSMyZZDOBkXsBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjOAQ eCa1g3Flg8UhRgEORiUe3hdTsoOFWBPLiitzDzFKcDArifC+WAYU4k1JrKxKLcqPLyrNSS0+ xCjNwaIkznug1TpQSCA9sSQ1OzW1ILUIJsvEwSnVwJh15JLsh0kOtmqW5oZZbItWX3Wdpnpn YcqRc7/Fs39Knn+nOFFf5IenfeeV/1kNLNv2Oaz/vWbKuZl8vvNbvtqprhPhPxF2cernc9uW 5/e5s6/b0loQrfp66o0p99jfXGVefemts/Cfi6eKOvNiKpbtlVNd+2C59pZX8iaFrKnLGr7w PfKzYtNQYinOSDTUYi4qTgQApc7wTP0BAAA= 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.5.8.172720 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' 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, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Ensure dma_free_coherent() is not called with incorrect arguments and only when the memory was actually allocated. This will prevent possible crashes on error paths of the top level media device driver, when fimc-is device gets unregistered and its driver detached. Signed-off-by: Sylwester Nawrocki Acked-by: Kyungmin Park --- drivers/media/platform/exynos4-is/fimc-is.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 128b73b..5476dce 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -367,6 +367,9 @@ static void fimc_is_free_cpu_memory(struct fimc_is *is) { struct device *dev = &is->pdev->dev; + if (is->memory.vaddr == NULL) + return; + dma_free_coherent(dev, is->memory.size, is->memory.vaddr, is->memory.paddr); }