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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham 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 362E9CA9EC3 for ; Thu, 31 Oct 2019 11:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F05FD2087F for ; Thu, 31 Oct 2019 11:12:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727223AbfJaLMf (ORCPT ); Thu, 31 Oct 2019 07:12:35 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:46884 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726722AbfJaLMe (ORCPT ); Thu, 31 Oct 2019 07:12:34 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 9420D28E1AE; Thu, 31 Oct 2019 11:12:32 +0000 (GMT) Date: Thu, 31 Oct 2019 12:12:28 +0100 From: Boris Brezillon To: , Cc: , , , Subject: Re: [PATCH v3 14/32] mtd: spi-nor: Fix retlen handling in sst_write() Message-ID: <20191031121228.09ad85c8@collabora.com> In-Reply-To: <20191029111615.3706-15-tudor.ambarus@microchip.com> References: <20191029111615.3706-1-tudor.ambarus@microchip.com> <20191029111615.3706-15-tudor.ambarus@microchip.com> Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 29 Oct 2019 11:17:10 +0000 wrote: > From: Tudor Ambarus > > In case the write of the first byte failed, retlen was incorrectly > incremented to *retlen += actual; on the exit path. retlen should be > incremented when actual data was written to the flash. > > Signed-off-by: Tudor Ambarus Reviewed-by: Boris Brezillon > --- > drivers/mtd/spi-nor/spi-nor.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index bc46b946ac77..889fd77dbe96 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -2667,7 +2667,7 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, > size_t *retlen, const u_char *buf) > { > struct spi_nor *nor = mtd_to_spi_nor(mtd); > - size_t actual; > + size_t actual = 0; > int ret; > > dev_dbg(nor->dev, "to 0x%08x, len %zd\n", (u32)to, len); > @@ -2680,9 +2680,8 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, > > nor->sst_write_second = false; > > - actual = to % 2; > /* Start write from odd address. */ > - if (actual) { > + if (to % 2) { > nor->program_opcode = SPINOR_OP_BP; > > /* write one byte. */ > @@ -2693,8 +2692,10 @@ static int sst_write(struct mtd_info *mtd, loff_t to, size_t len, > ret = spi_nor_wait_till_ready(nor); > if (ret) > goto sst_write_err; > + > + to++; > + actual++; > } > - to += actual; > > /* Write out most of the data here. */ > for (; actual < len - 1; actual += 2) {