aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/adb.c2
-rw-r--r--drivers/macintosh/via-pmu-led.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index e75e3be50811..75049e765191 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -83,7 +83,7 @@ static struct adb_driver *adb_controller;
83BLOCKING_NOTIFIER_HEAD(adb_client_list); 83BLOCKING_NOTIFIER_HEAD(adb_client_list);
84static int adb_got_sleep; 84static int adb_got_sleep;
85static int adb_inited; 85static int adb_inited;
86static DECLARE_MUTEX(adb_probe_mutex); 86static DEFINE_SEMAPHORE(adb_probe_mutex);
87static int sleepy_trackpad; 87static int sleepy_trackpad;
88static int autopoll_devs; 88static int autopoll_devs;
89int __adb_probe_sync; 89int __adb_probe_sync;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index d242976bcfe7..19c371809d77 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -92,8 +92,10 @@ static int __init via_pmu_led_init(void)
92 if (dt == NULL) 92 if (dt == NULL)
93 return -ENODEV; 93 return -ENODEV;
94 model = of_get_property(dt, "model", NULL); 94 model = of_get_property(dt, "model", NULL);
95 if (model == NULL) 95 if (model == NULL) {
96 of_node_put(dt);
96 return -ENODEV; 97 return -ENODEV;
98 }
97 if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && 99 if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
98 strncmp(model, "iBook", strlen("iBook")) != 0 && 100 strncmp(model, "iBook", strlen("iBook")) != 0 &&
99 strcmp(model, "PowerMac7,2") != 0 && 101 strcmp(model, "PowerMac7,2") != 0 &&