Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rpmsg-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg updates from Bjorn Andersson:
"This fixes a double free/destroy and drops an unnecessary local
variable in the rpmsg char driver"
* tag 'rpmsg-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
rpmsg: char: Avoid double destroy of default endpoint
rpmsg: char: Remove the unneeded result variable
+4
-5
+4
-5
drivers/rpmsg/rpmsg_char.c
+4
-5
drivers/rpmsg/rpmsg_char.c
···
76
76
77
77
mutex_lock(&eptdev->ept_lock);
78
78
if (eptdev->ept) {
79
-
rpmsg_destroy_ept(eptdev->ept);
79
+
/* The default endpoint is released by the rpmsg core */
80
+
if (!eptdev->default_ept)
81
+
rpmsg_destroy_ept(eptdev->ept);
80
82
eptdev->ept = NULL;
81
83
}
82
84
mutex_unlock(&eptdev->ept_lock);
···
426
424
struct rpmsg_channel_info chinfo)
427
425
{
428
426
struct rpmsg_eptdev *eptdev;
429
-
int ret;
430
427
431
428
eptdev = rpmsg_chrdev_eptdev_alloc(rpdev, parent);
432
429
if (IS_ERR(eptdev))
433
430
return PTR_ERR(eptdev);
434
431
435
-
ret = rpmsg_chrdev_eptdev_add(eptdev, chinfo);
436
-
437
-
return ret;
432
+
return rpmsg_chrdev_eptdev_add(eptdev, chinfo);
438
433
}
439
434
EXPORT_SYMBOL(rpmsg_chrdev_eptdev_create);
440
435