Merge master into can-usb1 branch to include proc update for 3.12+ kernels.

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

diff --git a/lincan/src/finish.c b/lincan/src/finish.c
index 2766c01a7b0f5e49cb9f2d98b2e2b7b12154abe9..226c4e29a736d174a3044f48762b67ea22f74fde 100644 (file)
--- a/lincan/src/finish.c
+++ b/lincan/src/finish.c
@@ -118,6 +118,10 @@ void canchip_done(struct canchip_t *chip)
        }
 
        can_checked_free(chip->chipspecops);
+
+       if(~chip->flags & CHIP_KEEP_DATA)
+               can_checked_free(chip->chip_data);
+       chip->chip_data = NULL;
        chip->chipspecops=NULL;
 
 }
@@ -142,6 +146,9 @@ void candevice_done(struct candevice_t *candev)
                candev->hwspecops->release_io(candev);
                candev->flags &= ~CANDEV_IO_RESERVED;
        }
+       if(candev->hwspecops->done_hw_data != NULL)
+               candev->hwspecops->done_hw_data(candev);
+
        can_checked_free(candev->hwspecops);
        candev->hwspecops=NULL;
 }