diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 00:45:06 -0700 |
| commit | 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 (patch) | |
| tree | ac3db2d4ae69e393d8423bb8c9304c75023dc805 /drivers/char/hw_random/n2-drv.c | |
| parent | b7679ab3f70482ff4b75a8c735c8224ebedb6020 (diff) | |
| parent | 99aa18278e867574d72201b806f82ace07d4804b (diff) | |
| download | linux-next-9b28b11e2a648f07c8481b9666ccf1c088e1ab74.tar.gz | |
Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/char/hw_random/n2-drv.c')
| -rw-r--r-- | drivers/char/hw_random/n2-drv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index 43ac61978d8b..ac6739e085e3 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c @@ -619,15 +619,18 @@ static void __devinit n2rng_driver_version(void) pr_info("%s", version); } +static const struct of_device_id n2rng_match[]; static int __devinit n2rng_probe(struct platform_device *op) { + const struct of_device_id *match; int victoria_falls; int err = -ENOMEM; struct n2rng *np; - if (!op->dev.of_match) + match = of_match_device(n2rng_match, &op->dev); + if (!match) return -EINVAL; - victoria_falls = (op->dev.of_match->data != NULL); + victoria_falls = (match->data != NULL); n2rng_driver_version(); np = kzalloc(sizeof(*np), GFP_KERNEL); |