Skip to content

Commit 240ba5b

Browse files
author
Bartosz Golaszewski
committed
Merge tag 'intel-gpio-v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-next
intel-gpio for v6.15-1 * A cleanup to remove unneeded ERR_CAST() in GPIO ACPI library The following is an automated git shortlog grouped by driver: gpiolib-acpi: - Drop unneeded ERR_CAST() in __acpi_find_gpio()
2 parents 21c853a + e646f0d commit 240ba5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpio/gpiolib-acpi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int
994994
desc = acpi_get_gpiod_from_data(fwnode,
995995
propname, idx, info);
996996
if (PTR_ERR(desc) == -EPROBE_DEFER)
997-
return ERR_CAST(desc);
997+
return desc;
998998

999999
if (!IS_ERR(desc))
10001000
return desc;

0 commit comments

Comments
 (0)