mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 04:21:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: bcm2835-audio: Check if workqueue allocation failed

Browse Source 
Currently, if allocating a workqueue fails, the driver will probe
successfully but it will silently do nothing, which is rather silly.
So instead bail out with -ENOMEM in bcm2835_audio_open() if
alloc_workqueue() fails, and remove the now pointless checks for a NULL
workqueue.

While at it, get rid of the rather pointless one-line function
my_workqueue_init().

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tuomas Tynkkynen
2018-07-13 00:54:16 +03:00
committed by Greg Kroah-Hartman
parent 81f34e96dc
commit 4feb0f375f
1 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
View File

@@ -117,44 +117,40 @@ static void my_wq_function(struct work_struct *work)
int bcm2835_audio_start(struct bcm2835_alsa_stream *alsa_stream)
{
if (alsa_stream->my_wq) {
struct bcm2835_audio_work *work;
struct bcm2835_audio_work *work;
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_START;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_START;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
return 0;
}
int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)
{
if (alsa_stream->my_wq) {
struct bcm2835_audio_work *work;
struct bcm2835_audio_work *work;
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_STOP;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_STOP;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
return 0;
}
@@ -162,40 +158,31 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream)
int bcm2835_audio_write(struct bcm2835_alsa_stream *alsa_stream,
unsigned int count, void *src)
{
if (alsa_stream->my_wq) {
struct bcm2835_audio_work *work;
struct bcm2835_audio_work *work;
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_WRITE;
work->src = src;
work->count = count;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
work = kmalloc(sizeof(*work), GFP_ATOMIC);
/*--- Queue some work (item 1) ---*/
if (!work) {
LOG_ERR(" .. Error: NULL work kmalloc\n");
return -ENOMEM;
}
INIT_WORK(&work->my_work, my_wq_function);
work->alsa_stream = alsa_stream;
work->cmd = BCM2835_AUDIO_WRITE;
work->src = src;
work->count = count;
if (!queue_work(alsa_stream->my_wq, &work->my_work)) {
kfree(work);
return -EBUSY;
}
return 0;
}
static void my_workqueue_init(struct bcm2835_alsa_stream *alsa_stream)
{
alsa_stream->my_wq = alloc_workqueue("my_queue", WQ_HIGHPRI, 1);
}
static void my_workqueue_quit(struct bcm2835_alsa_stream *alsa_stream)
{
if (alsa_stream->my_wq) {
flush_workqueue(alsa_stream->my_wq);
destroy_workqueue(alsa_stream->my_wq);
alsa_stream->my_wq = NULL;
}
flush_workqueue(alsa_stream->my_wq);
destroy_workqueue(alsa_stream->my_wq);
alsa_stream->my_wq = NULL;
}
static void audio_vchi_callback(void *param,
@@ -436,7 +423,9 @@ int bcm2835_audio_open(struct bcm2835_alsa_stream *alsa_stream)
int status;
int ret;
my_workqueue_init(alsa_stream);
alsa_stream->my_wq = alloc_workqueue("my_queue", WQ_HIGHPRI, 1);
if (!alsa_stream->my_wq)
return -ENOMEM;
ret = bcm2835_audio_open_connection(alsa_stream);
if (ret) {