From nobody Thu Feb 12 12:34:57 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BFAC16C86D for ; Wed, 12 Jun 2024 08:36:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718181406; cv=none; b=MzKnAc6+yzzFH7yfJe3yPU+vlXQ0lNO9KvkCe00NS7hG9q6RThJ9iVj35xinasudSHOueQvPe3LP+vgUvihlHV3FX/B946e+JZxWo6qx4VYxSAqOzLj02p9RHKq4EdlFY/kbAInkjeSPXN9xErY6PEy8mVOwaNdjKNyTQMmDywY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718181406; c=relaxed/simple; bh=t8vj4Z8K291bSOoqidlQpdF9N7ccu19T5Ou01u6zNgs=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=qg12zceVcuCEnCppaM7ZSSmUCetug6i/U/NoCadDHuTuYtlzhACqDpAT5yOmzEV2TiC6bcHgovTUD037SpKpe1uiZtgJq5D4cy2AZNVE80t9S4EFLn4ERLHFes0lzulEhCUxsEESpTV8cgS2NPpb7kaytP26OhyzOUZ5gT0Bfhs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--joychakr.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sskzFJ1s; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--joychakr.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sskzFJ1s" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc691f1f83aso284221276.1 for ; Wed, 12 Jun 2024 01:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718181403; x=1718786203; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=y2uwFL7y38zzuOIY6yZzuRuyB/ucVnnJQUO1JVoJCq4=; b=sskzFJ1sZWSEe6Iw3TMAwHTqO4GfBf60xA73ZznmIyEaBHRWfCjMaR6DaASqSaETam E4bs3aEYBAPKEOmJ3r+chYmhTsJ3qjBalv4TQBn+4mfNTI9hNpsUB6wo87lkQ4Syot39 +ldQmp8S7QsK6Ua1/liW/KPNEHXV9K9AASGRCC9PC29DRgJaXAreQxIv4znjZS51b1zO pdWlkg69NG80Qb4CI9gFCQSMKu4AFv6CJFwxlig0BJtGdKIrZeGKw5LAF2aicKMRjXqz e29cnV+3UFnUOnXHKnRY39U5y7truGnMQuTbkTxUfBcnIQxbAEE24r5xPmU1q3UK7SfY zTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718181403; x=1718786203; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=y2uwFL7y38zzuOIY6yZzuRuyB/ucVnnJQUO1JVoJCq4=; b=KA8v5ttmJpuFpvTr3+hZvpz7YllhbnCDTc6E9tZfLTgQaaTf/vT8DngGqgOZ6JG2CM UFumGoT9SPRhDOG7B/KxvglyiPpPKpWRqTPgA0iG2k9XW+oX2EgudaUhDkhc8B3yIEXU DMI6geC5K8dYdXXLT4ugb5oEBhqTiYZju1ArG0CAbZdYpHiKtDu6iijfrlml9c1hi2Z7 UfP1qqGdYSkFTssxq60uNPF3X9UlR9JbNOtAem/kUP1es3Zec2sexvTLMoksDj8d0+Xh T4iwnxI6iWuMe+nNY+C43OBTgLHngf03hCxdR+onskSuLIEQ//2QxIPRwBaLJuEQ4+Fr kQWA== X-Forwarded-Encrypted: i=1; AJvYcCUKasbk81w1+CAaGAz10ItEXCdbxIBQqiaM/vqhtWKl+AiQNFs8sU9HNELybuxmriUZwlOAgnalbbfqqObd/vSbMurQ2i4eQUygropH X-Gm-Message-State: AOJu0YxGGGxZJJ0RapnttgR/z7zR+kZjNy2+2di0y4PvEU3keSuO320m COAUTSi9865SBg0bXLU9sho+kJkvVFy2wYmvPfaUZl4kNscT5/uzOYXMZYYjq+R3M2dlAOifHF4 vWkRMv8yMAQ== X-Google-Smtp-Source: AGHT+IFIUVbh5Q1k3pO2RFjm8lrFGgxO8nKpG5vXdnLpOD1v7TpsJ/omxJ/hn/IlNpFIU9wvgTbQ8u8NRFYnbQ== X-Received: from joychakr.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:6ea]) (user=joychakr job=sendgmr) by 2002:a05:6902:2d03:b0:dfe:6bd5:21f4 with SMTP id 3f1490d57ef6-dfe6bd52823mr340249276.0.1718181403279; Wed, 12 Jun 2024 01:36:43 -0700 (PDT) Date: Wed, 12 Jun 2024 08:36:35 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.45.2.505.gda0bf45e8d-goog Message-ID: <20240612083635.1253039-1-joychakr@google.com> Subject: [PATCH] rtc: cmos: Fix return value of nvmem callbacks From: Joy Chakraborty To: Alexandre Belloni , Srinivas Kandagatla , Dan Carpenter Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Joy Chakraborty , stable@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Read/write callbacks registered with nvmem core expect 0 to be returned on success and a negative value to be returned on failure. cmos_nvram_read()/cmos_nvram_write() currently return the number of bytes read or written, fix to return 0 on success and -EIO incase number of bytes requested was not read or written. Fixes: 8b5b7958fd1c ("rtc: cmos: use generic nvmem") Cc: stable@vger.kernel.org Signed-off-by: Joy Chakraborty Reviewed-by: Dan Carpenter --- drivers/rtc/rtc-cmos.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 7d99cd2c37a0..35dca2accbb8 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -643,11 +643,10 @@ static int cmos_nvram_read(void *priv, unsigned int o= ff, void *val, size_t count) { unsigned char *buf =3D val; - int retval; =20 off +=3D NVRAM_OFFSET; spin_lock_irq(&rtc_lock); - for (retval =3D 0; count; count--, off++, retval++) { + for (; count; count--, off++) { if (off < 128) *buf++ =3D CMOS_READ(off); else if (can_bank2) @@ -657,7 +656,7 @@ static int cmos_nvram_read(void *priv, unsigned int off= , void *val, } spin_unlock_irq(&rtc_lock); =20 - return retval; + return count ? -EIO : 0; } =20 static int cmos_nvram_write(void *priv, unsigned int off, void *val, @@ -665,7 +664,6 @@ static int cmos_nvram_write(void *priv, unsigned int of= f, void *val, { struct cmos_rtc *cmos =3D priv; unsigned char *buf =3D val; - int retval; =20 /* NOTE: on at least PCs and Ataris, the boot firmware uses a * checksum on part of the NVRAM data. That's currently ignored @@ -674,7 +672,7 @@ static int cmos_nvram_write(void *priv, unsigned int of= f, void *val, */ off +=3D NVRAM_OFFSET; spin_lock_irq(&rtc_lock); - for (retval =3D 0; count; count--, off++, retval++) { + for (; count; count--, off++) { /* don't trash RTC registers */ if (off =3D=3D cmos->day_alrm || off =3D=3D cmos->mon_alrm @@ -689,7 +687,7 @@ static int cmos_nvram_write(void *priv, unsigned int of= f, void *val, } spin_unlock_irq(&rtc_lock); =20 - return retval; + return count ? -EIO : 0; } =20 /*----------------------------------------------------------------*/ --=20 2.45.2.505.gda0bf45e8d-goog