diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-05-03 10:23:43 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-05-03 10:23:43 +0300 |
| commit | 617e3ea3ed2ee26b22d372dc1ba39c71f9d1c8ed (patch) | |
| tree | 1b17c938b165abfe6e42a7d4aae935048dc5f01f /drivers/char/briq_panel.c | |
| parent | 7a57011a5e7c4082fdfd204115a8212298ef723f (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge branch 'origin'kvm-22
Diffstat (limited to 'drivers/char/briq_panel.c')
| -rw-r--r-- | drivers/char/briq_panel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index 8dcf9d20f449..c70d52ace8b2 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c @@ -202,13 +202,16 @@ static struct miscdevice briq_panel_miscdev = { static int __init briq_panel_init(void) { - struct device_node *root = find_path_device("/"); + struct device_node *root = of_find_node_by_path("/"); const char *machine; int i; machine = get_property(root, "model", NULL); - if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) + if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { + of_node_put(root); return -ENODEV; + } + of_node_put(root); printk(KERN_INFO "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n", |