From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751489AbeEJSjk (ORCPT ); Thu, 10 May 2018 14:39:40 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33062 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbeEJSjj (ORCPT ); Thu, 10 May 2018 14:39:39 -0400 X-Google-Smtp-Source: AB8JxZow8XacqUdKFzzr2aW1V0JEfKbGSBQhRuKb8Crj+keA7uZ3ImSQlu1q/ncADbcdQiadvb6g9w== From: Mathieu Malaterre To: Srinivas Kandagatla Cc: Mathieu Malaterre , linux-kernel@vger.kernel.org Subject: [PATCH v3] nvmem: properly handle returned value from nvmem_reg_read Date: Thu, 10 May 2018 20:39:33 +0200 Message-Id: <20180510183933.7082-1-malat@debian.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180509185724.24079-1-malat@debian.org> References: <20180509185724.24079-1-malat@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Function ‘nvmem_reg_read’ can return a non zero value indicating an error. This returned value should be read and error propagated to ‘nvmem_cell_prepare_write_buffer’. Silence a gcc warning (using W=1): drivers/nvmem/core.c:1093:9: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable] Signed-off-by: Mathieu Malaterre --- v3: return exact error code instead of EINVAL, tweak commit message a bit v2: prefer ERR_PTR(-EINVAL) over a simple return NULL drivers/nvmem/core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index b05aa8e81303..1e28597138c8 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1107,6 +1107,8 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, /* setup the first byte with lsb bits from nvmem */ rc = nvmem_reg_read(nvmem, cell->offset, &v, 1); + if (rc) + goto err; *b++ |= GENMASK(bit_offset - 1, 0) & v; /* setup rest of the byte if any */ @@ -1125,11 +1127,16 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, /* setup the last byte with msb bits from nvmem */ rc = nvmem_reg_read(nvmem, cell->offset + cell->bytes - 1, &v, 1); + if (rc) + goto err; *p |= GENMASK(7, (nbits + bit_offset) % BITS_PER_BYTE) & v; } return buf; +err: + kfree(buf); + return ERR_PTR(rc); } /** -- 2.11.0