From 81a2fff67a75d2ade3c0b627c08e07587ac46b76 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 15 Oct 2010 05:44:58 +0200
Subject: [PATCH] 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>
---
 drivers/staging/intel_sst/intel_sst_app_interface.c | 8 +++-----
 1 file 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)
 				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;
 	}
 
-- 
2.30.9