diff --git a/[refs] b/[refs] index 9bb13c28577f..eab585a1a0bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dff52795746846ca0accb639037c26715da12d5 +refs/heads/master: 7915c0d4d226a790e2ffb85cb3386ceaea6ffae2 diff --git a/trunk/drivers/staging/intel_sst/intel_sst_stream.c b/trunk/drivers/staging/intel_sst/intel_sst_stream.c index ff46d5ccf781..1ce3a9c4e3d5 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst_stream.c +++ b/trunk/drivers/staging/intel_sst/intel_sst_stream.c @@ -117,7 +117,8 @@ int sst_alloc_stream(char *params, unsigned int stream_ops, { struct ipc_post *msg = NULL; struct snd_sst_alloc_params alloc_param; - unsigned int pcm_slot = 0, num_ch, str_id; + unsigned int pcm_slot = 0, num_ch; + int str_id; struct snd_sst_stream_params *sparams; struct stream_info *str_info;