From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F93F2F531B; Sat, 12 Sep 2026 12:44:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789217097; cv=none; b=d3cQ6QOYM1/AQ71C805qEv1jD9uP+BYmvWed2734KDCm32v8cINVd7WZbaCWR/BLFe5owIanHmeHU0bL4Y+TgVku+Oh11CEX9Z72cB5/dRMOd9hcNm1kNIXsq8vYFLcf8XwgTFLDK8NfMNZ/ffOPkupYF9ayn5P3I8MfRKoaSJw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789217097; c=relaxed/simple; bh=yljiUgK/3rk2ky/BbOELNV4NvmCyUbcWzTZmmgJHFXQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BG5pjHpMqtqUejKw6OatpDQGdyqPn5ppYbd5nM4eA8JkTULOoMYjBHkntBC65H0qDMmz59UqM6L76fDuX1hMT9010VNN4MtcOH7nA/XPhG+nJ4phcokBmfd75ZQeKc9LVdsj3HUKIyi8K4/Bk4JQYvirXbke+OBKQquBUIBjtpM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=abOQ38Wq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="abOQ38Wq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3B841F0089A; Sat, 12 Sep 2026 12:44:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789217095; bh=HXgoYuwmP1lo+dtAyFoyyXJNu58ucEPscYqWsbRXy0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=abOQ38WqA6P6o3m3Y0RvM/FW8xk4C46HiAv+hRFjdpUVuToY2uQyK1w65U2b4AZva 2c62AlJ9fUH4SEY8UKsZcLn/hrj1IMay8Eqf8zeJIbTojW1M3Ix68HOgM49yWGhWL8 GNGlRpijTl8GPT4OKkU3auXnyfzY57lB7aoCuVrI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuanshen Cao , David Lechner , Jonathan Cameron , Sasha Levin Subject: [PATCH 6.12 0870/1376] iio: light: tsl2772: fix ALS calibscale readback Date: Sat, 12 Sep 2026 08:54:56 +0200 Message-ID: <20260912065626.948740775@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuanshen Cao [ Upstream commit ac75550ab5b5d73649bffea245c2075fd9249bd0 ] The read_raw() implementation uses IIO_LIGHT to distinguish between the ambient light and proximity channels when handling IIO_CHAN_INFO_CALIBSCALE. However, the ALS channel is registered as IIO_INTENSITY, while write_raw() correctly writes to IIO_INTENSITY. As a result, reading in_intensity0_calibscale incorrectly returns the proximity gain instead of the ALS gain. This causes the following user-visible behavior: - Writing in_intensity0_calibscale appears to have no effect because the readback reports the proximity gain. - Writing in_proximity0_calibscale causes both in_proximity0_calibscale and in_intensity0_calibscale to report the same value. Fix this by checking for IIO_INTENSITY in read_raw(), matching the channel definition and the existing write_raw() implementation. Fixes: 3c97c08b5735 ("staging: iio: add TAOS tsl2x7x driver") Signed-off-by: Yuanshen Cao Reviewed-by: David Lechner Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/light/tsl2772.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c index cab468a82b616..fffed029c24dd 100644 --- a/drivers/iio/light/tsl2772.c +++ b/drivers/iio/light/tsl2772.c @@ -1263,7 +1263,7 @@ static int tsl2772_read_raw(struct iio_dev *indio_dev, } break; case IIO_CHAN_INFO_CALIBSCALE: - if (chan->type == IIO_LIGHT) + if (chan->type == IIO_INTENSITY) *val = tsl2772_als_gain[chip->settings.als_gain]; else *val = tsl2772_prox_gain[chip->settings.prox_gain]; -- 2.53.0