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

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

ANDROID: fix up rpmsg_device ABI break 



In commit e70898ae ("rpmsg: Fix kfree() of static memory on setting
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: e70898ae ("rpmsg: Fix kfree() of static memory on setting driver_override")
Change-Id: I9a87b9cf412191d9872b48f1f876a81df6701de0
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 04433509)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
parent a1f6648a

drivers/rpmsg/rpmsg_core.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int rpmsg_register_device_override(struct rpmsg_device *rpdev, 


	device_initialize(dev);

	if (driver_override) {

		ret = driver_set_override(dev, &rpdev->driver_override,

		ret = driver_set_override(dev, (const char **)&rpdev->driver_override,

					  driver_override,

					  strlen(driver_override));

		if (ret) {

include/linux/rpmsg.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct rpmsg_channel_info { 
struct rpmsg_device {

	struct device dev;

	struct rpmsg_device_id id;

	const char *driver_override;

	char *driver_override;

	u32 src;

	u32 dst;

	struct rpmsg_endpoint *ept;