| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240814021517.4130238-3-sashal@kernel.org> Date: Tue, 13 Aug 2024 22:15:09 -0400 From: Sasha Levin <sashal@...nel.org> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org Cc: Richard Fitzgerald <rf@...nsource.cirrus.com>, Wolfram Sang <wsa+renesas@...g-engineering.com>, Sasha Levin <sashal@...nel.org>, linux-i2c@...r.kernel.org Subject: [PATCH AUTOSEL 6.6 3/7] i2c: Fix conditional for substituting empty ACPI functions From: Richard Fitzgerald <rf@...nsource.cirrus.com> [ Upstream commit f17c06c6608ad4ecd2ccf321753fb511812d821b ] Add IS_ENABLED(CONFIG_I2C) to the conditional around a bunch of ACPI functions. The conditional around these functions depended only on CONFIG_ACPI. But the functions are implemented in I2C core, so are only present if CONFIG_I2C is enabled. Signed-off-by: Richard Fitzgerald <rf@...nsource.cirrus.com> Signed-off-by: Wolfram Sang <wsa+renesas@...g-engineering.com> Signed-off-by: Sasha Levin <sashal@...nel.org> --- include/linux/i2c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 0dae9db275380..296e7e73a75ef 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -1033,7 +1033,7 @@ static inline int of_i2c_get_board_info(struct device *dev, struct acpi_resource; struct acpi_resource_i2c_serialbus; -#if IS_ENABLED(CONFIG_ACPI) +#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_I2C) bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares, struct acpi_resource_i2c_serialbus **i2c); int i2c_acpi_client_count(struct acpi_device *adev); -- 2.43.0
Powered by blists - more mailing lists