summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorPaweł Szewczyk <p.szewczyk@samsung.com>2016-09-26 18:45:47 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-09-26 18:45:47 +0200
commit00bb64ecfa87c3da13764578e0e65e9b4e72bbf8 (patch)
treef9fcceca49b7b92ae74c64e98d33f4758092edae /src/core
parentbc3bb330b8543a31d4a1f488cb782b6ff3519d6a (diff)
core: Fix USB functionfs activation and clarify its documentation (#4188)
There was no certainty about how the path in service file should look like for usb functionfs activation. Because of this it was treated differently in different places, which made this feature unusable. This patch fixes the path to be the *mount directory* of functionfs, not ep0 file path and clarifies in the documentation that ListenUSBFunction should be the location of functionfs mount point, not ep0 file itself.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/socket.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index 70d55dd9ed..b9032fa5c9 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1334,14 +1334,9 @@ static int usbffs_select_ep(const struct dirent *d) {
static int usbffs_dispatch_eps(SocketPort *p) {
_cleanup_free_ struct dirent **ent = NULL;
- _cleanup_free_ char *path = NULL;
int r, i, n, k;
- path = dirname_malloc(p->path);
- if (!path)
- return -ENOMEM;
-
- r = scandir(path, &ent, usbffs_select_ep, alphasort);
+ r = scandir(p->path, &ent, usbffs_select_ep, alphasort);
if (r < 0)
return -errno;
@@ -1356,7 +1351,7 @@ static int usbffs_dispatch_eps(SocketPort *p) {
for (i = 0; i < n; ++i) {
_cleanup_free_ char *ep = NULL;
- ep = path_make_absolute(ent[i]->d_name, path);
+ ep = path_make_absolute(ent[i]->d_name, p->path);
if (!ep)
return -ENOMEM;