aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2017-01-27 10:10:36 +0100
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-01-27 10:15:56 +0100
commit427456e4772caf155c20604a60265dbc5a126267 (patch)
treef023720267c62ca6c0c315c98216055768b83884 /drivers/memory
parentmemory/atmel-ebi: Fix ns <-> cycles conversions (diff)
downloadlinux-dev-427456e4772caf155c20604a60265dbc5a126267.tar.xz
linux-dev-427456e4772caf155c20604a60265dbc5a126267.zip
memory: atmel-ebi: Fix the test to enable generic SMC logic
We should test the apply value and not the ret one here. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Fixes: 6a4ec4cd0888 ("memory: add Atmel EBI (External Bus Interface) driver") Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/atmel-ebi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index 1eaaa2be8ff2..2c4c9a1978bc 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -503,7 +503,7 @@ static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,
* Attach the EBI device to the generic SMC logic if at least
* one "atmel,smc-" property is present.
*/
- if (ebi->ebi_csa && ret)
+ if (ebi->ebi_csa && apply)
regmap_field_update_bits(ebi->ebi_csa,
BIT(cs), 0);
}