Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f6648a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Lee Jones
Browse files

ANDROID: fix up platform_device ABI break 



In commit 063444d6 ("driver: platform: Add helper for safer setting
of driver_override"), a pointer was changed to const, which messes with
the CRC and ABI checks.  As the code is fine if this is left as
not-const, just put it back to preserve the abi.

Bug: 161946584
Fixes: 063444d6 ("driver: platform: Add helper for safer setting of driver_override")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieb4a730a6a5767d31fbec2f1ba683617f5cda7a9
(cherry picked from commit 398b357f)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
parent b05d8acf

drivers/base/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ static ssize_t driver_override_store(struct device *dev, 
	struct platform_device *pdev = to_platform_device(dev);

	int ret;



	ret = driver_set_override(dev, &pdev->driver_override, buf, count);

	ret = driver_set_override(dev, (const char **)&pdev->driver_override, buf, count);

	if (ret)

		return ret;

include/linux/platform_device.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct platform_device { 
	 * Driver name to force a match.  Do not set directly, because core

	 * frees it.  Use driver_set_override() to set or clear it.

	 */

	const char *driver_override;

	char *driver_override;



	/* MFD cell pointer */

	struct mfd_cell *mfd_cell;