From b01ec84b57f5da0f019bd405f6ef0acc5d40ae2a Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 15 Oct 2010 22:36:48 +0200 Subject: [PATCH] --- yaml --- r: 220375 b: refs/heads/master c: 9f407840bb888e683fa844b1b80eec54ced84653 h: refs/heads/master i: 220373: 6a73acfd574bf6d5c01a8e28f202631196d393af 220371: c5380a7c5e456b3de7f36053d20ad57748524561 220367: a8226f0fbc994ccd7830d0e3c512b70e48caa3cb v: v3 --- [refs] | 2 +- trunk/drivers/staging/intel_sst/intel_sst_fw_ipc.h | 1 - trunk/drivers/staging/intel_sst/intel_sst_stream.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3308443374a3..9e14c77a8e1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87b554a04a0d12f8ff3612b6c2e163e29a34616a +refs/heads/master: 9f407840bb888e683fa844b1b80eec54ced84653 diff --git a/trunk/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/trunk/drivers/staging/intel_sst/intel_sst_fw_ipc.h index 1a2f67f0aedc..9d3c36807e07 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst_fw_ipc.h +++ b/trunk/drivers/staging/intel_sst/intel_sst_fw_ipc.h @@ -31,7 +31,6 @@ */ #define MAX_NUM_STREAMS_MRST 3 -#define MAX_NUM_STREAMS_MFLD 6 #define MAX_NUM_STREAMS 6 #define MAX_DBG_RW_BYTES 80 #define MAX_NUM_SCATTER_BUFFERS 8 diff --git a/trunk/drivers/staging/intel_sst/intel_sst_stream.c b/trunk/drivers/staging/intel_sst/intel_sst_stream.c index 1ce3a9c4e3d5..b2c4b7067da0 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst_stream.c +++ b/trunk/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; }