Skip to content

Commit

Permalink
memory: atmel-sdramc: fix a possible NULL dereference
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
montjoie authored and alexandrebelloni committed Aug 31, 2016
1 parent ee4fec5 commit 7922118
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/memory/atmel-sdramc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 7922118

Please sign in to comment.