Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / staging / intel_sst / intel_sst_stream.c

diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c
index ff46d5ccf78145c6e17e2e5e6d17ae6ad05a8e1e..b2c4b7067da0215db08b13de609710553aa9b645 100644 (file)
--- a/drivers/staging/intel_sst/intel_sst_stream.c
+++ b/drivers/staging/intel_sst/intel_sst_stream.c
@@ -45,7 +45,7 @@
  */
 int sst_check_device_type(u32 device, u32 num_chan, u32 *pcm_slot)
 {
-       if (device > MAX_NUM_STREAMS_MFLD) {
+       if (device >= MAX_NUM_STREAMS) {
                pr_debug("sst: device type invalid %d\n", device);
                return -EINVAL;
        }
@@ -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;