Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Zenghui Yu <yuzenghui@huawei.com>
To:     <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
CC:     <rafael@kernel.org>, <lenb@kernel.org>,
        <wanghaibin.wang@huawei.com>, Zenghui Yu <yuzenghui@huawei.com>,
        Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH] ACPI: property: Fix mis-use of _Generic()
Date:   Fri, 12 Aug 2022 19:33:08 +0800
Message-ID: <20220812113308.1772-1-yuzenghui@huawei.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7BIT
Content-Type:   text/plain; charset=US-ASCII
Precedence: bulk

It looks wrong to pass __val as the control-expression of _Generic() which
will always return 0U this way and acpi_copy_property_array_uint() is
likely to return -EOVERFLOW error whilst it actually doesn't.

Use __val[i] to match the given type list.

Fixes: 923044133367 ("ACPI: property: Unify integer value reading functions")
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
---
 drivers/acpi/property.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 7b3ad8ed2f4e..1ededa618a88 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1042,7 +1042,7 @@ static int acpi_data_prop_read_single(const struct acpi_device_data *data,
 				ret = -EPROTO;				\
 				break;					\
 			}						\
-			if (__items[i].integer.value > _Generic(__val,	\
+			if (__items[i].integer.value > _Generic(__val[i], \
 								u8: U8_MAX, \
 								u16: U16_MAX, \
 								u32: U32_MAX, \
-- 
2.33.0