diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-18 18:53:55 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-18 18:53:55 +0100 |
| commit | 555b2b5d254d60c8b7b8ec566d2f8226f2441a5e (patch) | |
| tree | d5fa887cda974512f5e557fd21140ad0ac105b1e /drivers/memory | |
| parent | Merge tag 'v4.9-next-soc' of https://github.com/mbgg/linux-mediatek into next... (diff) | |
| parent | misc: sram: add Atmel securam support (diff) | |
| download | linux-555b2b5d254d60c8b7b8ec566d2f8226f2441a5e.tar.xz linux-555b2b5d254d60c8b7b8ec566d2f8226f2441a5e.zip | |
Merge tag 'at91-ab-4.10-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers
Drivers for 4.10:
- few fixes for the memory drivers
- minimal security module driver
- support for the Secure SRAM
* tag 'at91-ab-4.10-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
misc: sram: add Atmel securam support
misc: sram: document new compatible
ARM: at91: add secumod register definitions
Documentation: dt: atmel-at91: Document secumod bindings
memory: atmel-sdramc: use builtin_platform_driver to simplify the code
memory: atmel-ebi: fix return value check in at91_ebi_dev_disable()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/atmel-ebi.c | 2 | ||||
| -rw-r--r-- | drivers/memory/atmel-sdramc.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index b5ed3bd082b5..047d6fcdcec2 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -657,7 +657,7 @@ static int at91_ebi_dev_disable(struct at91_ebi *ebi, struct device_node *np) return -ENOMEM; newprop->value = devm_kstrdup(dev, "disabled", GFP_KERNEL); - if (!newprop->name) + if (!newprop->value) return -ENOMEM; newprop->length = sizeof("disabled"); diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c index 12080b05e3e6..b418b39af180 100644 --- a/drivers/memory/atmel-sdramc.c +++ b/drivers/memory/atmel-sdramc.c @@ -85,8 +85,4 @@ static struct platform_driver atmel_ramc_driver = { }, }; -static int __init atmel_ramc_init(void) -{ - return platform_driver_register(&atmel_ramc_driver); -} -device_initcall(atmel_ramc_init); +builtin_platform_driver(atmel_ramc_driver); |