diff options
| author |  Stefan Richter
| 2008-12-02 12:39:34 +0100 |
|---|---|---|
| committer |  Dan Dennedy
| 2008-12-03 19:56:32 -0800 |
| commit | 788442d4031ecf06f00415e865cdd776d3c579f2 (patch) | |
| tree | ca02150a68e5b7bf57c8837ab4a214c8f95836f2 /src/dispatch.c | |
| parent | Fix segfault in juju's handle_arm_request (diff) | |
[libraw1394 patch] Fix raw1394_channel_modify() on firewire-core
(juju)
Reported by Adrian Knoth: fw_channel_modify() was unable to allocate
some channels which were actually free.
http://marc.info/?l=linux1394-devel&t=122818128900002
This can be easily fixed by replacing fw_channel_modify() by
ieee1394_channel_modify() because this is highlevel enough to work with
Juju as well. We only may want a separate fw_channel_modify() in the
future when firewire-core gains a special ioctl() for that.
Also fix a documentation typo: raw1394_channel_modify() did not show up
in extracted API documentation due to a cut'n'paste typo in raw1394.h.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Diffstat (limited to 'src/dispatch.c')
| -rw-r--r-- | src/dispatch.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/dispatch.c b/src/dispatch.c index d202424..b5b123e 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -554,10 +554,7 @@ int raw1394_channel_modify (raw1394handle_t handle, unsigned int channel, errno = EINVAL; return -1; } - if (handle->is_fw) - return fw_channel_modify(handle, channel, mode); - else - return ieee1394_channel_modify(handle, channel, mode); + return ieee1394_channel_modify(handle, channel, mode); } int raw1394_iso_xmit_init(raw1394handle_t handle, |