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 E6FA542BEB0; Sat, 12 Sep 2026 10:40:05 +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=1789209608; cv=none; b=LtO9+wPxKifENj1n2TZ7wPNq0eRCMgzMpJr3Ka/inONa8f44HbezDJvwAghUrnz0YT4PL0WOLCXI3ElRVhmNrSIga18je86jzpc6Ez9a2dOxJabI3VT6z8Gnpvcff+w6c0I5zBJ1BufO96HIL8kIH7zmEp8Cvm9YWRfmpwrb/Jc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789209608; c=relaxed/simple; bh=UDwTFw/H54TNvmhK5DkaEwJaf5TQYp1Ef6a0dPZcYkM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J95X77DSphBumaR/07ZSc9QOMSZNvT6nqxYwieEZKqpld3Upn8w/exD5uklhgyFjdzHBuaUFQOcimoN7yXo34cgguOvcJZLRPogIAn5x1SCSLq60zvxhLe86vR8jCnvExuWE+ha0LJ7jOLDqcywY816iGd/g8iAyt/9upXUe5E8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bfZltqKu; 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="bfZltqKu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 855B51F000FF; Sat, 12 Sep 2026 10:40:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789209605; bh=fnGTCDhA+O59h9nNTLnja3Pk8hzmSBytkaPeQnih1OM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bfZltqKux0TZEBzGcZwuMJBE4j7wxEgGu+eAeKzfWfvmlSBZlr17G86u852NH5msh VJqsXi1TFx7NnffdoVfxWjKI9530Jsd/jruvngAIqcX4aRjuP3ibvTap3vJleIKVtX SIIC5aE/drCFGAskyuHEbCTW5lsyfEK9/9cyiUYA= 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.18 0855/1518] iio: light: tsl2772: fix ALS calibscale readback Date: Sat, 12 Sep 2026 08:50:24 +0200 Message-ID: <20260912065642.792420088@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@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.18-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 0b171106441ab..ffbde15401141 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