From patchwork Mon Nov 5 20:33:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 52782 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gJlYO-00031s-Tl; Mon, 05 Nov 2018 20:32:57 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730214AbeKFFyV (ORCPT + 1 other); Tue, 6 Nov 2018 00:54:21 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:44724 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725910AbeKFFyV (ORCPT ); Tue, 6 Nov 2018 00:54:21 -0500 Received: by mail-qt1-f193.google.com with SMTP id b22-v6so151215qtr.11 for ; Mon, 05 Nov 2018 12:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IFk1Sik/HKeMDm+yoV/mIVn8lL174bzzUEjBjk3/IWs=; b=mt4NRHUwmFwVGBH8iLWgqcwNM7YiZkAIN03GAeiLNJZzwhAlq32YM9odfxTJAXWf6p Hna2f9rlxdyMRnIBzUMyV0evk0tnjcvXfBqEk8+5wQOF/0x3x28V+MzXOG7hRv8kpjol YZ26XVrYhDMcOKiTtmZjjySzx81hK8+Q7b29oJPEJs4QDT3QQU0ufhfoQrXxC9EjRKZs Vgxy170ThjjSGx7JfCatsEuRRRfqUesNTmamxYqfGvOV01Jo6rW1VYO+5nU/+o2Pj4oD CB7PhV+BiVgk1Z89JpEMerQLcnwCLREGmOYojZ4j/Ucne+fGI3B48YhUJ1ZohpeNolrO MTnw== 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=IFk1Sik/HKeMDm+yoV/mIVn8lL174bzzUEjBjk3/IWs=; b=o/3mGyZ7moZ8Ge0TfYum00HxnYTYSX61bggBKvSFli3x/3GQB/ImIx2iwDf2aTtgyS l/jOq/C3aBt7lSN3SXJwy5IcNFYBBmsUngtaUBNsMcXc+Ojhd0W/RX3Ukv/Mu4QIUAkJ TsLDMrTkW2Rz1IfPlz74XyVjOGOgnSc+sqYB7A4/xHwV/sxXregCHDYLBcbJjTZ+idPo NvPUe5qzdjaG9PskpN6F+702zCjQiSYt4CctlhwKcy45R35iJL1fXaC79gdQbVN7JnAT xi5LFj/RI8VdSAZqXMtbAyb4SfvKSr3mJvi95oaxFAmVFdcwoJsKUiuLM4CkezSDqu0F XcmQ== X-Gm-Message-State: AGRZ1gJWKBkt8CwJ2VSBKBzNmoZ7Bm51Mx+2MACEGnMtuu3rttNw3LMs 7AWFb9pzN+qdhP6E2CyuVfo= X-Google-Smtp-Source: AJdET5f/eDgPPLPiKtaB8RF0HbQsALJWzxvX7mBT9Rod8reaa34tEf2qjgoHhzwKehU9q5oW7Lhmkg== X-Received: by 2002:ac8:5241:: with SMTP id y1mr23550638qtn.22.1541449974371; Mon, 05 Nov 2018 12:32:54 -0800 (PST) Received: from localhost.localdomain ([201.82.144.36]) by smtp.gmail.com with ESMTPSA id t43sm3470405qtc.53.2018.11.05.12.32.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Nov 2018 12:32:53 -0800 (PST) From: Fabio Estevam To: p.zabel@pengutronix.de Cc: mchehab@kernel.org, linux-media@vger.kernel.org, Fabio Estevam Subject: [PATCH 2/2] media: imx-pxp: Check for pxp_soft_reset() error Date: Mon, 5 Nov 2018 18:33:11 -0200 Message-Id: <1541449991-24768-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541449991-24768-1-git-send-email-festevam@gmail.com> References: <1541449991-24768-1-git-send-email-festevam@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org pxp_soft_reset() may fail with a timeout, so it is better to propagate the error in this case. Signed-off-by: Fabio Estevam --- drivers/media/platform/imx-pxp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c index 27780f1..b3700b8 100644 --- a/drivers/media/platform/imx-pxp.c +++ b/drivers/media/platform/imx-pxp.c @@ -1607,7 +1607,7 @@ static const struct v4l2_m2m_ops m2m_ops = { .job_abort = pxp_job_abort, }; -static void pxp_soft_reset(struct pxp_dev *dev) +static int pxp_soft_reset(struct pxp_dev *dev) { int ret; u32 val; @@ -1619,11 +1619,15 @@ static void pxp_soft_reset(struct pxp_dev *dev) ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val, val & BM_PXP_CTRL_CLKGATE, 0, 100); - if (ret < 0) + if (ret < 0) { pr_err("PXP reset timeout\n"); + return ret; + } writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR); writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR); + + return 0; } static int pxp_probe(struct platform_device *pdev) @@ -1670,7 +1674,9 @@ static int pxp_probe(struct platform_device *pdev) if (ret < 0) return ret; - pxp_soft_reset(dev); + ret = pxp_soft_reset(dev); + if (ret < 0) + return ret; spin_lock_init(&dev->irqlock);