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

Commit 1d865da7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v4.10-fixes' of git://github.com/andersson/remoteproc

Pull rpmsg fixes from Bjorn Andersson:
 "This fixes a regression introduced in v4.10-rc1 that prohibits
  multiple channels with the same name but different endpoint addresses
  to be used"

* tag 'rpmsg-v4.10-fixes' of git://github.com/andersson/remoteproc:
  rpmsg: virtio_rpmsg_bus: fix channel creation
parents 95ce1313 63447646
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ int rpmsg_register_device(struct rpmsg_device *rpdev)
	struct device *dev = &rpdev->dev;
	int ret;

	dev_set_name(&rpdev->dev, "%s:%s",
		     dev_name(dev->parent), rpdev->id.name);
	dev_set_name(&rpdev->dev, "%s.%s.%d.%d", dev_name(dev->parent),
		     rpdev->id.name, rpdev->src, rpdev->dst);

	rpdev->dev.bus = &rpmsg_bus;
	rpdev->dev.release = rpmsg_release_device;