diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-22 15:27:37 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-22 15:27:37 +0200 |
| commit | 324c654dfc28f899d150873ffb99549c0dcafe47 (patch) | |
| tree | a87780c03fe618bd9f653373cd10d248518c5eb7 /drivers/mfd/atmel-smc.c | |
| parent | soc: ti: knav: Add a NULL pointer check for kdev in knav_pool_create (diff) | |
| parent | memory: atmel-ebi: Fix smc cycle xlate converter (diff) | |
| download | linux-324c654dfc28f899d150873ffb99549c0dcafe47.tar.gz linux-324c654dfc28f899d150873ffb99549c0dcafe47.zip | |
Merge tag 'at91-ab-4.13-drivers-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes
Pull "Driver fixes for 4.13" from Alexandre Belloni:
- Multiple EBI/SMC timing setting/calculation fixes
* tag 'at91-ab-4.13-drivers-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
memory: atmel-ebi: Fix smc cycle xlate converter
memory: atmel-ebi: Allow t_DF timings of zero ns
memory: atmel-ebi: Fix smc timing return value evaluation
Diffstat (limited to 'drivers/mfd/atmel-smc.c')
| -rw-r--r-- | drivers/mfd/atmel-smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/atmel-smc.c b/drivers/mfd/atmel-smc.c index 954cf0f66a31..20cc0ea470fa 100644 --- a/drivers/mfd/atmel-smc.c +++ b/drivers/mfd/atmel-smc.c @@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_pulse); * parameter * * This function encodes the @ncycles value as described in the datasheet - * (section "SMC Pulse Register"), and then stores the result in the + * (section "SMC Cycle Register"), and then stores the result in the * @conf->setup field at @shift position. * * Returns -EINVAL if @shift is invalid, -ERANGE if @ncycles does not fit in |