Skip to content

Commit

Permalink
drivers: soc: atmel: add null entry at the end of at91_soc_allowed_li…
Browse files Browse the repository at this point in the history
…st[]

commit 680896556805d3ad3fa47f6002b87b3041a45ac2 upstream.

of_match_node() calls __of_match_node() which loops though the entries of
matches array. It stops when condition:
(matches->name[0] || matches->type[0] || matches->compatible[0]) is
false. Thus, add a null entry at the end of at91_soc_allowed_list[]
array.

Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs")
Cc: stable@vger.kernel.org #4.12+
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
claudiubeznea authored and Jimbo77 committed Feb 11, 2021
1 parent 40af305 commit d510605
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/soc/atmel/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
{ .compatible = "atmel,at91rm9200", },
{ .compatible = "atmel,at91sam9", },
{ .compatible = "atmel,sama5", },
{ .compatible = "atmel,samv7", }
{ .compatible = "atmel,samv7", },
{ }
};

static int __init atmel_soc_device_init(void)
Expand Down

0 comments on commit d510605

Please sign in to comment.