diff mbox

[1/2] mtd: spi-nor: Off by one in cqspi_setup_flash()

Message ID 20161013080646.GB3389@mwanda
State Accepted
Commit 193e87143c290ec16838f5368adc0e0bc94eb931
Headers show

Commit Message

Dan Carpenter Oct. 13, 2016, 8:06 a.m. UTC
There are CQSPI_MAX_CHIPSELECT elements in the ->f_pdata array so the >
should be >=.

Fixes: 140623410536 ('mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Marek Vasut Oct. 14, 2016, 7:19 a.m. UTC | #1
On 10/13/2016 10:06 AM, Dan Carpenter wrote:
> There are CQSPI_MAX_CHIPSELECT elements in the ->f_pdata array so the >
> should be >=.
> 
> Fixes: 140623410536 ('mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Marek Vasut <marex@denx.de>

> diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
> index d403ba7..944863b 100644
> --- a/drivers/mtd/spi-nor/cadence-quadspi.c
> +++ b/drivers/mtd/spi-nor/cadence-quadspi.c
> @@ -1082,7 +1082,7 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)
>  			goto err;
>  		}
>  
> -		if (cs > CQSPI_MAX_CHIPSELECT) {
> +		if (cs >= CQSPI_MAX_CHIPSELECT) {
>  			dev_err(dev, "Chip select %d out of range.\n", cs);
>  			goto err;
>  		}
>
Cyrille Pitchen Nov. 28, 2016, 8:19 a.m. UTC | #2
Le 14/10/2016 à 09:19, Marek Vasut a écrit :
> On 10/13/2016 10:06 AM, Dan Carpenter wrote:
>> There are CQSPI_MAX_CHIPSELECT elements in the ->f_pdata array so the >
>> should be >=.
>>
>> Fixes: 140623410536 ('mtd: spi-nor: Add driver for Cadence Quad SPI Flash Controller')
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied to git://github.com/spi-nor/linux.git

Thanks!
> 
>> diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
>> index d403ba7..944863b 100644
>> --- a/drivers/mtd/spi-nor/cadence-quadspi.c
>> +++ b/drivers/mtd/spi-nor/cadence-quadspi.c
>> @@ -1082,7 +1082,7 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)
>>  			goto err;
>>  		}
>>  
>> -		if (cs > CQSPI_MAX_CHIPSELECT) {
>> +		if (cs >= CQSPI_MAX_CHIPSELECT) {
>>  			dev_err(dev, "Chip select %d out of range.\n", cs);
>>  			goto err;
>>  		}
>>
> 
>
diff mbox

Patch

diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index d403ba7..944863b 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1082,7 +1082,7 @@  static int cqspi_setup_flash(struct cqspi_st *cqspi, struct device_node *np)
 			goto err;
 		}
 
-		if (cs > CQSPI_MAX_CHIPSELECT) {
+		if (cs >= CQSPI_MAX_CHIPSELECT) {
 			dev_err(dev, "Chip select %d out of range.\n", cs);
 			goto err;
 		}