intel_th: msu: Release resources on removal
authorAlexander Shishkin <alexander.shishkin@linux.intel.com>
Fri, 8 Apr 2016 14:37:40 +0000 (17:37 +0300)
committerAlexander Shishkin <alexander.shishkin@linux.intel.com>
Fri, 8 Apr 2016 14:45:46 +0000 (17:45 +0300)
Do release the resources when msu subdevice gets removed: stop the
capture if it is active (which is still possible even though the
module in pinned) and free the capture buffers.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reviewed-by: Laurent Fert <laurent.fert@intel.com>
drivers/hwtracing/intel_th/msu.c

index bcc3b471337746440e8ad2a7fc58d909a4446e70..0974090abc7d385c6b7599f4a52b04f6f7a92ae2 100644 (file)
@@ -1492,6 +1492,18 @@ static int intel_th_msc_probe(struct intel_th_device *thdev)
 
 static void intel_th_msc_remove(struct intel_th_device *thdev)
 {
+       struct msc *msc = dev_get_drvdata(&thdev->dev);
+       int ret;
+
+       intel_th_msc_deactivate(thdev);
+
+       /*
+        * Buffers should not be used at this point except if the
+        * output character device is still open and the parent
+        * device gets detached from its bus, which is a FIXME.
+        */
+       ret = msc_buffer_free_unless_used(msc);
+       WARN_ON_ONCE(ret);
 }
 
 static struct intel_th_driver intel_th_msc_driver = {