Message ID | 1490169240-25957-1-git-send-email-m.szyprowski@samsung.com |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp111262qgd; Wed, 22 Mar 2017 00:55:22 -0700 (PDT) X-Received: by 10.99.171.75 with SMTP id k11mr42804091pgp.98.1490169322081; Wed, 22 Mar 2017 00:55:22 -0700 (PDT) Return-Path: <linux-media-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a20si811078pga.96.2017.03.22.00.55.21; Wed, 22 Mar 2017 00:55:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758827AbdCVHyO (ORCPT <rfc822;vaibhav.hiremath@linaro.org> + 4 others); Wed, 22 Mar 2017 03:54:14 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:49429 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758514AbdCVHyK (ORCPT <rfc822;linux-media@vger.kernel.org>); Wed, 22 Mar 2017 03:54:10 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0ON700MKDHY6CW50@mailout3.w1.samsung.com>; Wed, 22 Mar 2017 07:54:06 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170322075406eucas1p1ace6ab5becf65c1ebac41cc6232ecea7~uJQjRGWtd0423504235eucas1p1w; Wed, 22 Mar 2017 07:54:06 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id FF.3C.16908.0AD22D85; Wed, 22 Mar 2017 07:54:08 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170322075405eucas1p1896d5fdc8729295cc775350e8e85ab62~uJQiqaA4w1248912489eucas1p17; Wed, 22 Mar 2017 07:54:05 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-da-58d22da0b736 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id C7.D1.10233.CAD22D85; Wed, 22 Mar 2017 07:54:20 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0ON700I09HY2VK10@eusync3.samsung.com>; Wed, 22 Mar 2017 07:54:05 +0000 (GMT) From: Marek Szyprowski <m.szyprowski@samsung.com> To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski <m.szyprowski@samsung.com>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Andrzej Hajda <a.hajda@samsung.com>, Krzysztof Kozlowski <krzk@kernel.org>, stable@vger.kernel.org Subject: [PATCH] media: s5p-mfc: Fix unbalanced call to clock management Date: Wed, 22 Mar 2017 08:53:57 +0100 Message-id: <1490169240-25957-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsWy7djPc7oLdC9FGOxdZGNxa905Vovz5zew W/Rs2MpqMeP8PiaLtUfuslscftPOarFg4yNGB3aPTas62Tz6tqxi9Pi8SS6AOYrLJiU1J7Ms tUjfLoEr4+CXaWwFH9grZi3tY29gPMfWxcjJISFgIrFr13RWCFtM4sK99WBxIYFljBKT7gR1 MXIB2Z8ZJRZ/+M4E03BmWyMrRAKoqOvObWYIp4FJYn73RxaQKjYBQ4mut11go0QEnCQWzvrL DlLELHCEUaJ/01ewfcICHhLPez+BNbAIqEosezKFHcTmBYr/ujqDHWKdnMTJY5PB1kkInGCT eHetA6iBA8iRldh0gBmixkXi5sy9ULawxKvjW6B6ZSQuT+5mgbD7GSWaWrUh7BmMEufe8kLY 1hKHj18Eu4dZgE9i0rbpzBDjeSU62oQgSjwkHi+cDTXeUWJx4xQWSBDFSiz68pJ9AqP0AkaG VYwiqaXFuempxYZ6xYm5xaV56XrJ+bmbGIExefrf8fc7GJ82hxxiFOBgVOLhVZC/GCHEmlhW XJl7iFGCg1lJhHe+zKUIId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rx7F1wJFxJITyxJzU5NLUgt gskycXBKNTAq50VxJ10ql5xR+OvoKSWnNPYWMfdQr7OeZUrnjlW3356gWMmwfcH7ZJsF+2Lz rrQ2tk1dtvDMs1R/J3O1tSLqfxdq/J8rWcn/TWpjAcvM1UmPfzo9VlOV6rXgbN9+8d7ijg9d J51XTP+YtObbva1Vuyd/dnvrZy/2N3hy7hatmWv9r/2q4JutxFKckWioxVxUnAgAY4n7QMUC AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBLMWRmVeSWpSXmKPExsVy+t/xq7prdC9FGKw8b2Fxa905Vovz5zew W/Rs2MpqMeP8PiaLtUfuslscftPOarFg4yNGB3aPTas62Tz6tqxi9Pi8SS6AOcrNJiM1MSW1 SCE1Lzk/JTMv3VYpNMRN10JJIS8xN9VWKULXNyRISaEsMacUyDMyQAMOzgHuwUr6dgluGQe/ TGMr+MBeMWtpH3sD4zm2LkZODgkBE4kz2xpZIWwxiQv31gPFuTiEBJYwSuz9OIUFwmlikpgw azcTSBWbgKFE19susG4RASeJhbP+soMUMQscY5S4cnwCC0hCWMBD4nnvJzCbRUBVYtmTKewg Ni9Q/NfVGewQ6+QkTh6bzDqBkXsBI8MqRpHU0uLc9NxiI73ixNzi0rx0veT83E2MwFDcduzn lh2MXe+CDzEKcDAq8fAqyF+MEGJNLCuuzD3EKMHBrCTCO1/mUoQQb0piZVVqUX58UWlOavEh RlOg5ROZpUST84FxklcSb2hiaG5paGRsYWFuZKQkzjv1w5VwIYH0xJLU7NTUgtQimD4mDk6p BsYdWvU5B98wiHoEqcy/XsQlFTKjcdeJ/x31p2rs78U8ufdDo+ayTU+2yo0fWnpR3D3+Bbx7 ncSmn9kxSZ/DN39ujL6rzIfqVO0WLu3ZyheFlF7s6mjuz11k/46V9RRTwcnm2X//vNynwcyr +EHra/C+6LPf1m06KnPeVzPwqULWpRmtotvW5yixFGckGmoxFxUnAgC3oaKVWwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170322075405eucas1p1896d5fdc8729295cc775350e8e85ab62 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1B?= =?utf-8?b?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?utf-8?q?Marek_Szyprowski=1BSRPOL-Kernel_=28TP=29=1BSam?= =?utf-8?q?sung_Electronics=1BSenior_Software_Engineer?= X-Sender-Code: =?utf-8?q?C10=1BEHQ=1BC10CD02CD027392?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170322075405eucas1p1896d5fdc8729295cc775350e8e85ab62 X-RootMTR: 20170322075405eucas1p1896d5fdc8729295cc775350e8e85ab62 References: <CGME20170322075405eucas1p1896d5fdc8729295cc775350e8e85ab62@eucas1p1.samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index 0c7ef6251252..76d4681a1c79 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -211,6 +211,7 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) } s5p_mfc_clock_on(); ret = s5p_mfc_init_hw(dev); + s5p_mfc_clock_off(); if (ret) mfc_err("Failed to reinit FW\n"); }
Clock should be turned off after calling s5p_mfc_init_hw() from the watchdog worker, like it is already done in the s5p_mfc_open() which also calls this function. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Fixes: af93574678108 ("[media] MFC: Add MFC 5.1 V4L2 driver") CC: stable@vger.kernel.org # v3.7+ --- This issue was there from the beggining of the driver, but this patch applies cleanly only to v3.7+ kernels. --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 + 1 file changed, 1 insertion(+) -- 1.9.1