Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220357
b: refs/heads/master
c: 81a2fff
h: refs/heads/master
i:
  220355: c8d5414
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Oct 15, 2010
1 parent 2aec8b0 commit f9f8a36
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1055cc99bd84ff478fa18a1964b2445d551d0bc8
refs/heads/master: 81a2fff67a75d2ade3c0b627c08e07587ac46b76
8 changes: 3 additions & 5 deletions trunk/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 f9f8a36

Please sign in to comment.