git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic...
[sfrench/cifs-2.6.git]
/
drivers
/
spi
/
spi-atmel.c
diff --git
a/drivers/spi/spi-atmel.c
b/drivers/spi/spi-atmel.c
index bc879930470b0e43aa666b965c818621c026ef2a..9641237295cd7987e533f03fcdff7e494d912f9a 100644
(file)
--- a/
drivers/spi/spi-atmel.c
+++ b/
drivers/spi/spi-atmel.c
@@
-994,13
+994,6
@@
static int atmel_spi_setup(struct spi_device *spi)
as = spi_master_get_devdata(spi->master);
as = spi_master_get_devdata(spi->master);
- if (spi->chip_select > spi->master->num_chipselect) {
- dev_dbg(&spi->dev,
- "setup: invalid chipselect %u (%u defined)\n",
- spi->chip_select, spi->master->num_chipselect);
- return -EINVAL;
- }
-
/* see notes above re chipselect */
if (!atmel_spi_is_v2(as)
&& spi->chip_select == 0
/* see notes above re chipselect */
if (!atmel_spi_is_v2(as)
&& spi->chip_select == 0