2010-08-08 14:14:25

by Anton Vorontsov

Subject: [PATCH] mmc_spi: Fix unterminated of_match_table

commit 2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15 ("of: refactor
of_modalias_node() and remove explicit match table"), introduced
an unterminated of_match_table, which may cause kernel to oops.

This patch fixes the issue by adding an empty device ID.

Signed-off-by: Anton Vorontsov <[email protected]>
---
drivers/mmc/host/mmc_spi.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index 7b0f3ef..1145ea0 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1536,6 +1536,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
#if defined(CONFIG_OF)
static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
{ .compatible = "mmc-spi-slot", },
+ {},
};
#endif

--
1.7.0.5

2010-08-08 15:03:05

by Grant Likely

Subject: Re: [PATCH] mmc_spi: Fix unterminated of_match_table

On Sun, Aug 8, 2010 at 8:14 AM, Anton Vorontsov <[email protected]> wrote:
> commit 2ffe8c5f323c3b9749bf7bc2375d909d20bdbb15 ("of: refactor
> of_modalias_node() and remove explicit match table"), introduced
> an unterminated of_match_table, which may cause kernel to oops.
>
> This patch fixes the issue by adding an empty device ID.
>
> Signed-off-by: Anton Vorontsov <[email protected]>

Thanks Anton. Merged into my next-devicetree branch.

g.

> ---
> ?drivers/mmc/host/mmc_spi.c | ? ?1 +
> ?1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
> index 7b0f3ef..1145ea0 100644
> --- a/drivers/mmc/host/mmc_spi.c
> +++ b/drivers/mmc/host/mmc_spi.c
> @@ -1536,6 +1536,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
> ?#if defined(CONFIG_OF)
> ?static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
> ? ? ? ?{ .compatible = "mmc-spi-slot", },
> + ? ? ? {},
> ?};
> ?#endif
>
> --
> 1.7.0.5
>



--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.