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 195833B38A4; Sat, 12 Sep 2026 18:58:41 +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=1789239522; cv=none; b=ZHdqbSoNpTrH4uSapTuCokNqlyWwueaTjWikQHhJczZoDNpNxLunzHtpb/vlZxMBYyJp+3bwX2g0/b2UIljEiztIxZOz/6M9g/KlgmzbxQC8VjZ6hZKsm/5KEs72LU9m9fAb61PmNZO4u0GKaj5Ak2G7ZdlGXFLSKtrbFyf2mHE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789239522; c=relaxed/simple; bh=+NRSi3VhT1zRQ95+0gTp0sY/s/6locob8pNI5dX7pYE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R/mp5avkMRhIANUPNoFD2eyvrMBCpr18l5/DQwfi8SEk3s+kLuvi/3B52Y4hCXIuQy0MudkHXlb105xM8Hx/JRzTys6lYSJc3KlivOB/VCKg7uTZ9O0JUFMVTmjU0XS9hSt3j5Rgyb3guL+9YjDsArGSNwaa+m/oaNf/YYxyk1E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w89p3dZu; 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="w89p3dZu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28D2B1F000FF; Sat, 12 Sep 2026 18:58:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789239521; bh=uaSRoJ1Rj7CkIsW0LF7jGa6Rm/MQAWSYijBlvIDFmOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w89p3dZuNnQ9UL7FYBjVn6JL70FkzH5JIoqNi3DvvXviQy3/gi2iavM8IB/hm/Ddl U1tiLTg2uAzgIJtFAkwnk3Jhv9b1ctSMLGdRQ+ig2UihUsPhUuMGFFzVsStJi0AXNb tUxOYaTEf9ciaEYtED2pL7ZVFAE8lEJFQAdIaGPE= 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 5.15 682/935] iio: light: tsl2772: fix ALS calibscale readback Date: Sat, 12 Sep 2026 09:01:52 +0200 Message-ID: <20260912065542.485107955@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065526.833703348@linuxfoundation.org> References: <20260912065526.833703348@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 5.15-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 ff33ad3714206..b4eb756631735 100644 --- a/drivers/iio/light/tsl2772.c +++ b/drivers/iio/light/tsl2772.c @@ -1268,7 +1268,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