[PATCH 2/2] staging: bcm2835-audio: Don't leak workqueue if open fails

[Tuomas Tynkkynen]

Currently, if bcm2835_audio_open() fails partway, the allocated
workqueue is leaked. Avoid that.

While at it, propagate the return value of
bcm2835_audio_open_connection() on failure instead of returning -1.

Signed-off-by: Tuomas Tynkkynen <tuo...@tuxera.com>
---
 .../staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c 
b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 85ed807bb873..779c1e993b55 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -416,16 +416,16 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream 
*alsa_stream)
                return -ENOMEM;
 
        ret = bcm2835_audio_open_connection(alsa_stream);
-       if (ret) {
-               ret = -1;
-               goto exit;
-       }
+       if (ret)
+               goto free_wq;
+
        instance = alsa_stream->instance;
        LOG_DBG(" instance (%p)\n", instance);
 
        if (mutex_lock_interruptible(&instance->vchi_mutex)) {
                LOG_DBG("Interrupted whilst waiting for lock on (%d)\n", 
instance->num_connections);
-               return -EINTR;
+               ret = -EINTR;
+               goto free_wq;
        }
        vchi_service_use(instance->vchi_handle[0]);
 
@@ -448,7 +448,11 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream 
*alsa_stream)
 unlock:
        vchi_service_release(instance->vchi_handle[0]);
        mutex_unlock(&instance->vchi_mutex);
-exit:
+
+free_wq:
+       if (ret)
+               destroy_workqueue(alsa_stream->my_wq);
+
        return ret;
 }
 
-- 
2.16.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel