From patchwork Thu Nov 28 16:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 180450 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp373317ile; Thu, 28 Nov 2019 08:50:14 -0800 (PST) X-Google-Smtp-Source: APXvYqxlAdAb1TnE1sBJNXQo1eajMYbImjIKqfwEjSaTesS8UNjjDJOrKJqz5F0k5T6cW67ArzYh X-Received: by 2002:a17:906:404d:: with SMTP id y13mr57097507ejj.276.1574959814861; Thu, 28 Nov 2019 08:50:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574959814; cv=none; d=google.com; s=arc-20160816; b=rBONPWmdkzqHjfgNnE5PJTvxIfeigAVnvYoeY6pN5v2x0GpY/vDVEmDrGnuhrAtgEs 0NgZulIXdoaOzQ+DLb0ofRVDV+U4vT4qNyYUZha7dzq+PRwn7vOlx7mdgkf9sEqbNe2A fcyTE4CW7ZuSUkE+TOno47iUrVztYhgWyXBFs5EnTYxEaSrZh1s86WzlhD6Fl3DdpTvy /49Tu6tpvZYiTKgRf+eviyBuXe7I1BZVIbGY9SkgDA5Cutqm5xCaoFR8Fw18TFgtnu21 o5jt61tZh5SM47Pv5q8TfHMsFVng8A2yoq0XRsyrAVM3QNfdtguBunI+tu6hnvUJ/Eof 4ONg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=3gfqS5lOXPiWWEEMhIxCyyS+fLBSJCNPeR6VbsvmT98=; b=zDmLGhzjaDRllK4xrLCRaXCEmXRRgPMz/pzKLBVawvpF53p3jLk6K3J9ShVHPIdGdo jADA4341yS/pV9JBYz+ih+eneELwxrPEOTBXxMAwMhDD+mjYFP5rXSWK+EQEQrUZZ4NZ W4I5HPf0Kh8pJ3b6hLkQkNKuVdVsEVOxN7rry2XUUZMwA2wF2N/LmdrEzGuxKDuz6kwc Y4Sn87/gmf0hNDmI1wTtc0FLR780e5O41LzQ9EukQDgYh9tleODCmnUJ/0wQ/3wlQd88 S0+H0SwS/gs59v+5XyNVOkXubjO2c3PXsNYSlbZ9C6aHj0PliL3ij8mSs+86xcgb6tVr bYyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhdXMvF7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e26si12800266edv.82.2019.11.28.08.50.14; Thu, 28 Nov 2019 08:50:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jhdXMvF7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726822AbfK1QuK (ORCPT + 27 others); Thu, 28 Nov 2019 11:50:10 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:46277 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbfK1QuJ (ORCPT ); Thu, 28 Nov 2019 11:50:09 -0500 Received: by mail-pf1-f196.google.com with SMTP id 193so13355019pfc.13 for ; Thu, 28 Nov 2019 08:50:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3gfqS5lOXPiWWEEMhIxCyyS+fLBSJCNPeR6VbsvmT98=; b=jhdXMvF7E8/2RYD6Amz40/5Dec9vo4TrYTFm/r6nKztuLd4EU47wPRpIEnVGukrPq9 6KJX/Lx31gcsN472LKTKhC9qqVht7WRMvzIuEkgW84gnYt1Q1V5qsybFpoRhsKZYSaZk D8zz/gLD9NiXIi51FQrr8I1tiAgYXwIfUVNtoINE4E40elNOWuicMEf8RRSLfBou5lMD 21OIJW3h2SLpS3astqaYv2D1m65ILNsIQBe50CNQUvHJ8zlw4lYds5HZrqh88S3ZtnkY pMwWQeWqjtQaCpV7SrSyzXfsgvRuVQTusIn9jJ9kHRDKOfFhlkKAT3ImyVmHC6nCcJWO XvqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3gfqS5lOXPiWWEEMhIxCyyS+fLBSJCNPeR6VbsvmT98=; b=LmRb/57HaUKdKqZlzyOwspPzeNuktlcDnwHcIPlwGfZQSTPxE6/L9om5bVfFdsl/rz +Hb3V0NM4PPSIDI3A/X81p7XF8rbCVR05THSUCmTWrLhWChAVTDqoZE/4zf7ruilIa+9 LKSRUavqNCJdFXj0mOuOCyOdWoFANRzJEN0dv5g7fKnCb0kot7lEIYGeGAh2kR/PFHB/ n9xGh99/GCiDV/CJuiw14V+JgcsepxzcuzfmgTf4CY139V6YdeUPbc35LF6sv4EYw62m 6rmJ4iOXC7hPPi95IvWYtAygE3SYp5Z2L8EdrlOplyLCbcRfzgY8lt6WfUKbe/DlM7ke IN+A== X-Gm-Message-State: APjAAAXVm9PL7B2RniS2xG5usrydx2fUjZ0hmq1EoqjmctHPtayGlU4U 5K9j0spKJUwXdiFQRYXtscv8oA== X-Received: by 2002:a63:e84d:: with SMTP id a13mr1089909pgk.193.1574959808249; Thu, 28 Nov 2019 08:50:08 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a15sm2450343pfh.169.2019.11.28.08.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 08:50:07 -0800 (PST) From: Mathieu Poirier To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [stable 4.19][PATCH 04/17] media: stm32-dcmi: fix check of pm_runtime_get_sync return value Date: Thu, 28 Nov 2019 09:49:49 -0700 Message-Id: <20191128165002.6234-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191128165002.6234-1-mathieu.poirier@linaro.org> References: <20191128165002.6234-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hugues Fruchet commit ab41b99e7e55c85f29ff7b54718ccbbe051905e7 upstream Start streaming was sometimes failing because of pm_runtime_get_sync() non-0 return value. In fact return value was not an error but a positive value (1), indicating that PM was already enabled. Fix this by going to error path only with negative return value. Signed-off-by: Hugues Fruchet Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Cc: stable # 4.19 Signed-off-by: Mathieu Poirier --- drivers/media/platform/stm32/stm32-dcmi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index d86944109cbf..18d0b5641789 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -584,9 +584,9 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) int ret; ret = pm_runtime_get_sync(dcmi->dev); - if (ret) { - dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync\n", - __func__); + if (ret < 0) { + dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync (%d)\n", + __func__, ret); goto err_release_buffers; }