From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 491B5C28EBD for ; Sun, 9 Jun 2019 17:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 174FA20652 for ; Sun, 9 Jun 2019 17:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100231; bh=I/9DT0jMwSJ4P0cBxwApaDdYapQ/q+TUlGmEcnouttQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VvlJ83C0T5lxlK4QjLxsRIfz7VG720svQXbg6tXhPuqr2g4uTh5WKWqczULAYJlhQ LAD4ZLhPYkVFoSoCLb9h2KO56NICsTIKbWwOXA1OF047JO6KxHOaOBUTkTizrVwRGR 7W24ojOf7P1qGzHPa6DGVg3mCytjvD/fGmbZdS7o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388286AbfFIRCm (ORCPT ); Sun, 9 Jun 2019 13:02:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:40652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387669AbfFIRCi (ORCPT ); Sun, 9 Jun 2019 13:02:38 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C028206DF; Sun, 9 Jun 2019 17:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099758; bh=I/9DT0jMwSJ4P0cBxwApaDdYapQ/q+TUlGmEcnouttQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d5Vn6N80rdkBkUClmtdTLgFcA+bzbRdEza95qvQRoRVrG9hTrLdfNWHc4LcDuzY7Y Dc2qYbc4GiVC+KF4rM+6Zetfrup05H2NUKDZYeTh7RLL80RlJTTIatjhOKOoYFbaFA d36hofYrf2AJRcw9AoDZShnwZlt+req3wiRmtHNY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Laurent Pinchart , Ulf Hansson , Sasha Levin Subject: [PATCH 4.4 138/241] mmc_spi: add a status check for spi_sync_locked Date: Sun, 9 Jun 2019 18:41:20 +0200 Message-Id: <20190609164151.772632630@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164147.729157653@linuxfoundation.org> References: <20190609164147.729157653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 611025983b7976df0183390a63a2166411d177f1 ] In case spi_sync_locked fails, the fix reports the error and returns the error code upstream. Signed-off-by: Kangjie Lu Reviewed-by: Laurent Pinchart Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mmc_spi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index e03ec74f3fb08..40a369c7005a8 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -819,6 +819,10 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t, } status = spi_sync_locked(spi, &host->m); + if (status < 0) { + dev_dbg(&spi->dev, "read error %d\n", status); + return status; + } if (host->dma_dev) { dma_sync_single_for_cpu(host->dma_dev, -- 2.20.1