Skip to content

Commit c732f0b

Browse files
claudiubezneaksacilotto
authored andcommitted
drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
BugLink: https://bugs.launchpad.net/bugs/1916056 commit 6808965 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: caab13b ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs") Cc: [email protected] #4.12+ Signed-off-by: Claudiu Beznea <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 6a357c5 commit c732f0b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/soc/atmel/soc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
268268
{ .compatible = "atmel,at91rm9200", },
269269
{ .compatible = "atmel,at91sam9", },
270270
{ .compatible = "atmel,sama5", },
271-
{ .compatible = "atmel,samv7", }
271+
{ .compatible = "atmel,samv7", },
272+
{ }
272273
};
273274

274275
static int __init atmel_soc_device_init(void)

0 commit comments

Comments
 (0)