Skip to content

Commit

Permalink
Staging: intel_sst: cleanup naming a little
Browse files Browse the repository at this point in the history
&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>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Oct 15, 2010
1 parent 1055cc9 commit 81a2fff
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/intel_sst/intel_sst_app_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 81a2fff

Please sign in to comment.