Merge branch 'master' into can-usb1

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

diff --git a/lincan/src/usbcan.c b/lincan/src/usbcan.c
index 3e1306a28d07996694065a0c671f94003e7c7adf..f76d5c697f0aa71e91284108543d72847c2530e6 100644 (file)
--- a/lincan/src/usbcan.c
+++ b/lincan/src/usbcan.c
@@ -795,7 +795,7 @@ void usbcan_kthread_write_handler(struct usbcan_usb *dev, struct usbcan_message
                canque_free_outslot(obj->qends, m->qedge, m->slot);
                m->slot=NULL;
        }
                canque_free_outslot(obj->qends, m->qedge, m->slot);
                m->slot=NULL;
        }

-       
+

        /*FIXME - why there*/
        can_msgobj_clear_fl(obj,TX_PENDING);
 
        /*FIXME - why there*/
        can_msgobj_clear_fl(obj,TX_PENDING);
 


@@ -828,7 +828,7 @@ void usbcan_kthread_write_request_handler(struct usbcan_usb *dev, struct msgobj_
                clear_bit(USBCAN_FREE_TX_URB,&dev->flags);
                return;
        }
                clear_bit(USBCAN_FREE_TX_URB,&dev->flags);
                return;
        }

-       
+

        m = list_first_entry(&dev->tx_idle_list, typeof(*m), list_node);
 
        cmd=canque_test_outslot(obj->qends, &m->qedge, &m->slot);
        m = list_first_entry(&dev->tx_idle_list, typeof(*m), list_node);
 
        cmd=canque_test_outslot(obj->qends, &m->qedge, &m->slot);


@@ -1270,7 +1270,7 @@ int usbcan_kthread(void *data)
                usb_fill_bulk_urb(u, dev->udev,
                        usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr),
                        m->msg, USBCAN_TRANSFER_SIZE, usbcan_tx_callback, m);
                usb_fill_bulk_urb(u, dev->udev,
                        usb_sndbulkpipe(dev->udev, dev->bulk_out_endpointAddr),
                        m->msg, USBCAN_TRANSFER_SIZE, usbcan_tx_callback, m);

-                       
+

                set_bit(USBCAN_MESSAGE_FREE,&m->flags);
                set_bit(USBCAN_MESSAGE_TYPE_TX,&m->flags);
                list_add_tail(&m->list_node, &dev->tx_idle_list);
                set_bit(USBCAN_MESSAGE_FREE,&m->flags);
                set_bit(USBCAN_MESSAGE_TYPE_TX,&m->flags);
                list_add_tail(&m->list_node, &dev->tx_idle_list);


@@ -1443,7 +1443,7 @@ static int usbcan_probe(struct usb_interface *interface, const struct usb_device
        }
 
        usb_get_dev(usbdevs->udev);
        }
 
        usb_get_dev(usbdevs->udev);

-       
+

        /* save our data pointer in this interface device */
        usb_set_intfdata(interface, usbdevs);
 
        /* save our data pointer in this interface device */
        usb_set_intfdata(interface, usbdevs);
 


@@ -1489,10 +1489,10 @@ void release_device(struct candevice_t *candev){
 #endif
        struct usbcan_devs *usbdevs = (struct usbcan_devs *)candev->sysdevptr.anydev;
        int j;
 #endif
        struct usbcan_devs *usbdevs = (struct usbcan_devs *)candev->sysdevptr.anydev;
        int j;

-       
+

        if (!usbdevs)
                return;
        if (!usbdevs)
                return;

-       
+

        cleanup_hotplug_dev(usbdevs->candev);
 
        if (usbdevs->devs){
        cleanup_hotplug_dev(usbdevs->candev);
 
        if (usbdevs->devs){


@@ -1542,7 +1542,7 @@ static void usbcan_disconnect(struct usb_interface *interface)
        }
 
        unlock_kernel();
        }
 
        unlock_kernel();

-       
+

 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
        kref_put(&usbdevs->candev->refcount,release_device);
 #else
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
        kref_put(&usbdevs->candev->refcount,release_device);
 #else