Patchwork mmc_spi: Fix unterminated of_match_table

login
register
mail settings
Submitter Anton Vorontsov
Date Aug. 8, 2010, 2:14 p.m.
Message ID <20100808141422.GA9670@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/61212/
State Not Applicable
Headers show

Comments

Anton Vorontsov - Aug. 8, 2010, 2:14 p.m.
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 <avorontsov@mvista.com>
---
 drivers/mmc/host/mmc_spi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Grant Likely - Aug. 8, 2010, 3:02 p.m.
On Sun, Aug 8, 2010 at 8:14 AM, Anton Vorontsov <avorontsov@mvista.com> 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 <avorontsov@mvista.com>

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
>

Patch

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