From f9f8a36f13fd46f0828e1357cfbabc9933b6fcee Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 15 Oct 2010 05:44:58 +0200 Subject: [PATCH] --- yaml --- r: 220357 b: refs/heads/master c: 81a2fff67a75d2ade3c0b627c08e07587ac46b76 h: refs/heads/master i: 220355: c8d54147e7db7ea47fb735a80e7132d13e161d43 v: v3 --- [refs] | 2 +- trunk/drivers/staging/intel_sst/intel_sst_app_interface.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0b49d9ae01c6..e4ed5f1d1334 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1055cc99bd84ff478fa18a1964b2445d551d0bc8 +refs/heads/master: 81a2fff67a75d2ade3c0b627c08e07587ac46b76 diff --git a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c index 82768fa51874..1429386a1c67 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c +++ b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c @@ -1056,20 +1056,18 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg) retval = sst_capture_frame(str_id); else { retval = -EINVAL; - mutex_unlock( - &sst_drv_ctx->streams[str_id].lock); + mutex_unlock(&stream->lock); break; } if (retval < 0) { stream->status = STREAM_INIT; - mutex_unlock( - &sst_drv_ctx->streams[str_id].lock); + mutex_unlock(&stream->lock); break; } } else { retval = -EINVAL; } - mutex_unlock(&sst_drv_ctx->streams[str_id].lock); + mutex_unlock(&stream->lock); break; }