staging: bcm2835-audio: deallocate work when queue_work(...) fails

aishpant · gregkh · commit e3173e5783ff · 2017-03-14T07:57:53.000+08:00
This patch de-allocates work when queue_work(..) fails in the
bcm2835-audio work functions

Signed-off-by: Aishwarya Pant &lt;aishpant@gmail.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -145,6 +145,7 @@ int bcm2835_audio_start(struct bcm2835_alsa_stream *alsa_stream)
 		work->alsa_stream = alsa_stream;
 		work->cmd = BCM2835_AUDIO_START;
 		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
+			kfree(work);
 			return -EBUSY;
 		}
 	}
@@ -168,6 +169,7 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)
 		work->alsa_stream = alsa_stream;
 		work->cmd = BCM2835_AUDIO_STOP;
 		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
+			kfree(work);
 			return -EBUSY;
 		}
 	}
@@ -194,6 +196,7 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
 		work->src = src;
 		work->count = count;
 		if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
+			kfree(work);
 			return -EBUSY;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ int bcm2835_audio_start(struct bcm2835_alsa_stream *alsa_stream)`
`145`	`145`	`work->alsa_stream = alsa_stream;`
`146`	`146`	`work->cmd = BCM2835_AUDIO_START;`
`147`	`147`	`if (!queue_work(alsa_stream->my_wq, &work->my_work)) {`
	`148`	`+ kfree(work);`
`148`	`149`	`return -EBUSY;`
`149`	`150`	`}`
`150`	`151`	`}`
`@@ -168,6 +169,7 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)`
`168`	`169`	`work->alsa_stream = alsa_stream;`
`169`	`170`	`work->cmd = BCM2835_AUDIO_STOP;`
`170`	`171`	`if (!queue_work(alsa_stream->my_wq, &work->my_work)) {`
	`172`	`+ kfree(work);`
`171`	`173`	`return -EBUSY;`
`172`	`174`	`}`
`173`	`175`	`}`
`@@ -194,6 +196,7 @@ int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,`
`194`	`196`	`work->src = src;`
`195`	`197`	`work->count = count;`
`196`	`198`	`if (!queue_work(alsa_stream->my_wq, &work->my_work)) {`
	`199`	`+ kfree(work);`
`197`	`200`	`return -EBUSY;`
`198`	`201`	`}`
`199`	`202`	`}`