Patch from Stephen Tiedemann to allow reentrancy in raw1394's usage of

raw1394_request's.


git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@128 53a565d1-3bb7-0310-b661-cf11e63c67ab

1 files changed, 9 insertions, 9 deletions

diff --git a/src/fcp.c b/src/fcp.c
index e5d98d5..da05b03 100644
--- a/src/fcp.c
+++ b/src/fcp.c
@@ -22,17 +22,17 @@ static int do_fcp_listen(struct raw1394_handle *handle, int startstop)
         struct sync_cb_data sd = { 0, 0 };
         struct raw1394_reqhandle rh = { (req_callback_t)_raw1394_sync_cb, &sd };
         int err;
-        struct raw1394_request *req = &handle->req;
+        struct raw1394_request req;
 
-        CLEAR_REQ(req);
-        req->type = RAW1394_REQ_FCP_LISTEN;
-        req->generation = handle->generation;
-        req->misc = startstop;
-        req->tag = ptr2int(&rh);
-        req->recvb = ptr2int(handle->buffer);
-        req->length = 512;
+        CLEAR_REQ(&req);
+        req.type = RAW1394_REQ_FCP_LISTEN;
+        req.generation = handle->generation;
+        req.misc = startstop;
+        req.tag = ptr2int(&rh);
+        req.recvb = ptr2int(handle->buffer);
+        req.length = 512;
 
-        err = write(handle->fd, req, sizeof(*req));
+        err = write(handle->fd, &req, sizeof(req));
         while (!sd.done) {
                 if (err < 0) return err;
                 err = raw1394_loop_iterate(handle);