Merge branch 'can-usb1' into spican1

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

diff --git a/lincan/src/setup.c b/lincan/src/setup.c
index b051d04425f776c841616462e4c4c5cf7dda664b..d378617b55359fdbe8f86caf3e7ebe85c6a5dc19 100644 (file)
--- a/lincan/src/setup.c
+++ b/lincan/src/setup.c
@@ -255,6 +255,10 @@ int init_device_struct(int card, int *chan_param_idx_p, int *irq_param_idx_p)
        candev->dev_base_addr=io[card];
        clock=clockfreq[card];
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+       kref_init(&candev->refcount);
+#endif
+
        candev->hwspecops=(struct hwspecops_t *)can_checked_malloc(sizeof(struct hwspecops_t));
        if (candev->hwspecops==NULL)
                goto error_nomem;
@@ -345,6 +349,10 @@ int init_chip_struct(struct candevice_t *candev, int chipnr, int irq, long baudr
 
        chip->write_register=candev->hwspecops->write_register;
        chip->read_register=candev->hwspecops->read_register;
+       chip->spi_transfer=candev->hwspecops->spi_transfer;
+       chip->spi_acquire_bus=candev->hwspecops->spi_acquire_bus;
+       chip->spi_release_bus=candev->hwspecops->spi_release_bus;
+
 
        chip->chipspecops=can_checked_malloc(sizeof(struct chipspecops_t));
        if (chip->chipspecops==NULL)