aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-10-14 23:44:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-15 15:24:39 -0400
commit81a2fff67a75d2ade3c0b627c08e07587ac46b76 (patch)
treee38d97f49b00c266403ec9086a55b692a790a314
parent1055cc99bd84ff478fa18a1964b2445d551d0bc8 (diff)
Staging: intel_sst: cleanup naming a little
&sst_drv_ctx->streams[str_id].lock and &stream->lock are the same. The mutex_lock() uses &stream->lock so this makes things consistent and it's nicer to read as well. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/intel_sst/intel_sst_app_interface.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
index 82768fa51874..1429386a1c67 100644
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/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)
1056 retval = sst_capture_frame(str_id); 1056 retval = sst_capture_frame(str_id);
1057 else { 1057 else {
1058 retval = -EINVAL; 1058 retval = -EINVAL;
1059 mutex_unlock( 1059 mutex_unlock(&stream->lock);
1060 &sst_drv_ctx->streams[str_id].lock);
1061 break; 1060 break;
1062 } 1061 }
1063 if (retval < 0) { 1062 if (retval < 0) {
1064 stream->status = STREAM_INIT; 1063 stream->status = STREAM_INIT;
1065 mutex_unlock( 1064 mutex_unlock(&stream->lock);
1066 &sst_drv_ctx->streams[str_id].lock);
1067 break; 1065 break;
1068 } 1066 }
1069 } else { 1067 } else {
1070 retval = -EINVAL; 1068 retval = -EINVAL;
1071 } 1069 }
1072 mutex_unlock(&sst_drv_ctx->streams[str_id].lock); 1070 mutex_unlock(&stream->lock);
1073 break; 1071 break;
1074 } 1072 }
1075 1073