From patchwork Fri Nov 15 22:33:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 179540 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp13127163ilf; Fri, 15 Nov 2019 14:34:56 -0800 (PST) X-Google-Smtp-Source: APXvYqwR7s6KQA2tByIETBT3KfV5ANJ8z7kNkRi5NGH0cLB0I2QJ7wLB+Wtf7y7wiuPs6bx4j13D X-Received: by 2002:a17:906:bfe3:: with SMTP id vr3mr4364373ejb.273.1573857296056; Fri, 15 Nov 2019 14:34:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573857296; cv=none; d=google.com; s=arc-20160816; b=cploBBwQq6ku+IXLQxRz1YinxmZp+bMdwftosewBtEHb5NqJh8qeqX6KiCSjKmyiet R5NyGIXeHOrHGzxrBzLcoDCUGf031TR8V2+gwcE4Pm2Q9Ic5dhXwqh947/sMxTBJzeMx dyzOwTPbaoYT8tceXLy47YNyUWkIqsqU1lLO7aaACmDvsRDvpGkwCZgnA1T4C80d2Lo0 f1EKv8zwoeq0m5KEKud/XI7aIcn367zs8cl3TwWpYHjc/fozbq4pUGdwVqUkMpfQH/RS zaWrMvYaMU6vEEB+TgU7LLT8OfrVWvuJzw48wgkulvvv7HAPmlEe52wM3zvWo2Y3nPcv sWeQ== 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=6V0ioyUbzQMXQMBXE7qcEPEwz5yqv4QBePomZ4UZPqc=; b=xW7JhnJUXarza4a5LEfby0Icbkn6TpTkBAjEjmh9FbJbDBF0M+BgB3DM7z5qBbIx3y zkc2bBUaxW8Eju1No3i5d3Xf8gLq+o1clj6oaHlqrtBWehBRw+9WneNYOIj42uOMNYWs ioigF/MSPt6g/+iGR21iGH2TU0BUcA8ZRuu7oinMGU59bgnMkKwT6rhg4Pv3rIsiOBDT GEKgBoY1V9c6jRktwJT+fWq+a6peqaEnlnQOkwK7NUJ+unzaJ3g+DO91M1/D/Xe2geHW p2KagWFMbPIbjacCrPtTI0zw4uBkh3b/oyX8B0sg4j0ZiiD5Aw47xsbu72QlLYdLOxKO Xl8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k7kBlMxX; 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 h3si3757303ejc.136.2019.11.15.14.34.55; Fri, 15 Nov 2019 14:34:56 -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=k7kBlMxX; 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 S1727275AbfKOWeH (ORCPT + 26 others); Fri, 15 Nov 2019 17:34:07 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41580 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727210AbfKOWeD (ORCPT ); Fri, 15 Nov 2019 17:34:03 -0500 Received: by mail-pf1-f196.google.com with SMTP id p26so7327667pfq.8 for ; Fri, 15 Nov 2019 14:34:03 -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=6V0ioyUbzQMXQMBXE7qcEPEwz5yqv4QBePomZ4UZPqc=; b=k7kBlMxXsG6gA/UcmlwTDggZ65v+ipn3YUceSw3Oegz9WKEnqSckQYHfAT76F7fPjN s7QKdRMaRPqZFZSI/xOc6FPxjFzbfDiSqxO16UNRWzwpNND4qj7rCnHyntrgf8gWE2+b z31khVZDNGGcS5gNaQpHfSp84XhywQ1G5jrK5dsnXgm8xzY2Bttagju6GbfsQCuUz1t1 a1jGQru7049kf1xVk9PcTip/XRGMTQ3ZDi5E07+5EowNcQ7XYcGxNTDsz6/vv89SFEC4 rOkGhyiZz4rpSal4odmYlyBahCIUN9rZMet/cta0i71K0Th0xdUbgnAkFRClk3lff4d1 /chw== 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=6V0ioyUbzQMXQMBXE7qcEPEwz5yqv4QBePomZ4UZPqc=; b=gtPjIjAIS0RoNd6B7kOaMSlpnGdV22uhzyTogsru+3wyINTwysI/+rG1Ahf/dYoylK uIlOMVY2DYoSKtosa3e1Ezy2IrTYo/KiRI/PF8FNQdjpUL4uP8m/1pVCso29Wmwf2bYj 2JNkM7qX4xmTclwmVTBwYdCM9RoUMnJ+VAdpOCsvXAvFJLRvsZSUFxGDQ1fIaY2yIsNM SPf/qJ+bCNOWGRlleHG35Rm1tXfe9E+7eC+PSMIW4j1O9oBj0b4nKoSzvUa19XkOH88q MFuWXLuNvvrhPpe1Qr0LBlAzHYStOq2iq0WW2hktmUI0c6TDlO+CnbueubeSMq/VT6+5 r22w== X-Gm-Message-State: APjAAAVr4l+K50kXPZLjd9PWRoAbiJHFXK6yb2IWQf3LvEn+9PFDvFqS KRnSFAGy08u92o8RBZgzOxeHag== X-Received: by 2002:a62:1c8:: with SMTP id 191mr20454995pfb.152.1573857242567; Fri, 15 Nov 2019 14:34:02 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m15sm11699724pfh.19.2019.11.15.14.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 14:34:01 -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 06/20] media: stm32-dcmi: fix check of pm_runtime_get_sync return value Date: Fri, 15 Nov 2019 15:33:42 -0700 Message-Id: <20191115223356.27675-6-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191115223356.27675-1-mathieu.poirier@linaro.org> References: <20191115223356.27675-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; }