changed usb vendor and product id.

[lincan.git] / lincan / src / can_queue.c

diff --git a/lincan/src/can_queue.c b/lincan/src/can_queue.c
index a75bb467899dba2291d09dd25a81187bc5bc7701..d90b9c56c64090b2d135fb3016d9af5ba296b6ed 100644 (file)
--- a/lincan/src/can_queue.c
+++ b/lincan/src/can_queue.c
@@ -524,7 +524,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
        if(qedge == NULL) return -1;
        DEBUGQUE("canqueue_connect_edge %d\n",qedge->edge_num);
        canque_edge_incref(qedge);
-       flags=canque_edge_lock_both_ends(qedge);
+       flags=canque_edge_lock_both_ends(inends, outends);
        can_spin_lock(&qedge->fifo.fifo_lock);
        qedge->inends=inends;
        list_add(&qedge->inpeers,&inends->inlist);
@@ -532,7 +532,7 @@ int canqueue_connect_edge(struct canque_edge_t *qedge, struct canque_ends_t *ine
        list_add(&qedge->outpeers,&outends->outlist);
        list_add(&qedge->activepeers,&outends->idle);
        can_spin_unlock(&qedge->fifo.fifo_lock);
-       canque_edge_unlock_both_ends(qedge, flags);
+       canque_edge_unlock_both_ends(inends, outends, flags);
        canque_notify_bothends(qedge, CANQUEUE_NOTIFY_ATTACH);
 
        if(canque_fifo_test_and_set_fl(&qedge->fifo, READY))
@@ -557,7 +557,7 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
        outends=qedge->outends;
 
        if(inends && outends) {
-               flags=canque_edge_lock_both_ends(qedge);
+               flags=canque_edge_lock_both_ends(inends, outends);
        } else {
                DEBUGQUE("canqueue_disconnect_edge called with not fully connected edge");
                if(inends) can_spin_lock_irqsave(&inends->ends_lock,flags);
@@ -582,7 +582,7 @@ int canqueue_disconnect_edge(struct canque_edge_t *qedge)
        can_spin_unlock(&qedge->fifo.fifo_lock);
 
        if(inends && outends) {
-               canque_edge_unlock_both_ends(qedge, flags);
+               canque_edge_unlock_both_ends(inends, outends, flags);
        } else {
                if(outends) can_spin_unlock(&outends->ends_lock);
                if(inends) can_spin_unlock_irqrestore(&inends->ends_lock,flags);