diff options
| author | Georgia Brikis <g.brikis@samsung.com> | 2016-03-22 12:08:42 +0100 |
|---|---|---|
| committer | Georgia Brikis <g.brikis@samsung.com> | 2016-03-23 17:47:45 +0100 |
| commit | 27a6ea9163384993312f3a0da9710c9151111f50 (patch) | |
| tree | b212ffcd0be70610c785a0f30cf06ea73ad06b2b /src/core/socket.c | |
| parent | Merge pull request #2880 from keszybz/more-tests (diff) | |
| download | systemd-27a6ea9163384993312f3a0da9710c9151111f50.tar.xz systemd-27a6ea9163384993312f3a0da9710c9151111f50.zip | |
core: Fix path for opening ffs endpoint ep0
usbffs_address_create() expects an absolute path to the file that is
supposed to be opened. The path specified only leads to the directory
containing the endpoint ep0 not the endpoint itself. This commit adds
the endpoints name to the path.
Diffstat (limited to '')
| -rw-r--r-- | src/core/socket.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 87586c1c2e..dd515a17a5 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1341,8 +1341,12 @@ static int socket_open_fds(Socket *s) { break; case SOCKET_USB_FUNCTION: + { + _cleanup_free_ char *ep = NULL; - p->fd = usbffs_address_create(p->path); + ep = path_make_absolute("ep0", p->path); + + p->fd = usbffs_address_create(ep); if (p->fd < 0) { r = p->fd; goto rollback; @@ -1357,7 +1361,7 @@ static int socket_open_fds(Socket *s) { goto rollback; break; - + } default: assert_not_reached("Unknown port type"); } |