summaryrefslogtreecommitdiff
path: root/drivers/memory
diff options
context:
space:
mode:
authorLABBE Corentin <clabbe.montjoie@gmail.com>2016-08-16 16:53:18 +0300
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-08-31 20:19:16 +0300
commit7922118f8f3e76eb6534e9221a6c9f496c0ae699 (patch)
treecd228a2906913e5c129a8e5abb863d8fa2177df2 /drivers/memory
parentee4fec5f44a2c0f59327748217319f78e49b90a7 (diff)
downloadlinux-7922118f8f3e76eb6534e9221a6c9f496c0ae699.tar.xz
memory: atmel-sdramc: fix a possible NULL dereference
of_match_device could return NULL, and so cause a NULL pointer dereference later. For fixing this problem, we use of_device_get_match_data(), this will simplify the code a little by using a standard function for getting the match data. Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/atmel-sdramc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c
index 53a341f3b305..12080b05e3e6 100644
--- a/drivers/memory/atmel-sdramc.c
+++ b/drivers/memory/atmel-sdramc.c
@@ -53,12 +53,10 @@ static const struct of_device_id atmel_ramc_of_match[] = {
static int atmel_ramc_probe(struct platform_device *pdev)
{
- const struct of_device_id *match;
const struct at91_ramc_caps *caps;
struct clk *clk;
- match = of_match_device(atmel_ramc_of_match, &pdev->dev);
- caps = match->data;
+ caps = of_device_get_match_data(&pdev->dev);
if (caps->has_ddrck) {
clk = devm_clk_get(&pdev->dev, "ddrck");