projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc-3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[linux-2.6-block.git]
/
drivers
/
mfd
/
mc13xxx-spi.c
diff --git
a/drivers/mfd/mc13xxx-spi.c
b/drivers/mfd/mc13xxx-spi.c
index 38ab67829791b1b8d7b5c2d33d24ac66999f2a3f..702925e242c90597618bb1158faffa653516eae6 100644
(file)
--- a/
drivers/mfd/mc13xxx-spi.c
+++ b/
drivers/mfd/mc13xxx-spi.c
@@
-140,6
+140,11
@@
static int mc13xxx_spi_probe(struct spi_device *spi)
mc13xxx->irq = spi->irq;
+ spi->max_speed_hz = spi->max_speed_hz ? : 26000000;
+ ret = spi_setup(spi);
+ if (ret)
+ return ret;
+
mc13xxx->regmap = devm_regmap_init(&spi->dev, ®map_mc13xxx_bus,
&spi->dev,
&mc13xxx_regmap_spi_config);