diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 15:38:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 15:38:31 -0700 |
| commit | 426b8eeb058a16c63759b3f48394601e1ed74e31 (patch) | |
| tree | 3331982f3a02962d784053d09420e6b03a20e5f7 /drivers/rpmsg/rpmsg_char.c | |
| parent | Merge tag 'platform-drivers-x86-v4.13-1' of git://git.infradead.org/linux-platform-drivers-x86 (diff) | |
| parent | rpmsg: Make modalias work for DeviceTree based devices (diff) | |
| download | linux-dev-426b8eeb058a16c63759b3f48394601e1ed74e31.tar.xz linux-dev-426b8eeb058a16c63759b3f48394601e1ed74e31.zip | |
Merge tag 'rpmsg-v4.13' of git://github.com/andersson/remoteproc
Pull rpmsg updates from Bjorn Andersson:
"This introduces the Qualcomm GLINK protocol driver and
DeviceTree-based modalias support, as well as a number of smaller
fixes"
* tag 'rpmsg-v4.13' of git://github.com/andersson/remoteproc:
rpmsg: Make modalias work for DeviceTree based devices
rpmsg: Drop VIRTUALIZATION dependency from RPMSG_VIRTIO
rpmsg: Don't overwrite release op of rpdev
rpmsg: virtio_rpmsg_bus: cleanup multiple assignment to ops
rpmsg: virtio_rpmsg_bus: fix nameservice address
rpmsg: cleanup incorrect function in dev_err message
rpmsg: virtio_rpmsg_bus: fix announce for devices without endpoint
rpmsg: Introduce Qualcomm RPM glink driver
soc: qcom: Add device tree binding for GLINK RPM
rpmsg: Release rpmsg devices in backends
Diffstat (limited to 'drivers/rpmsg/rpmsg_char.c')
| -rw-r--r-- | drivers/rpmsg/rpmsg_char.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 2576284f99a7..e0996fce3963 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -390,7 +390,7 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev, ret = device_add(dev); if (ret) { - dev_err(dev, "device_register failed: %d\n", ret); + dev_err(dev, "device_add failed: %d\n", ret); put_device(dev); } @@ -505,7 +505,7 @@ static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev) ret = device_add(dev); if (ret) { - dev_err(&rpdev->dev, "device_register failed: %d\n", ret); + dev_err(&rpdev->dev, "device_add failed: %d\n", ret); put_device(dev); } |