diff options
Diffstat (limited to 'drivers/macintosh/via-pmu-led.c')
-rw-r--r-- | drivers/macintosh/via-pmu-led.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c index 179af10105d9..fc89a7047cd0 100644 --- a/drivers/macintosh/via-pmu-led.c +++ b/drivers/macintosh/via-pmu-led.c | |||
@@ -81,7 +81,7 @@ static struct led_classdev pmu_led = { | |||
81 | }; | 81 | }; |
82 | 82 | ||
83 | #ifdef CONFIG_PM | 83 | #ifdef CONFIG_PM |
84 | static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) | 84 | static void pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) |
85 | { | 85 | { |
86 | unsigned long flags; | 86 | unsigned long flags; |
87 | 87 | ||
@@ -99,8 +99,6 @@ static int pmu_led_sleep_call(struct pmu_sleep_notifier *self, int when) | |||
99 | break; | 99 | break; |
100 | } | 100 | } |
101 | spin_unlock_irqrestore(&pmu_blink_lock, flags); | 101 | spin_unlock_irqrestore(&pmu_blink_lock, flags); |
102 | |||
103 | return PBOOK_SLEEP_OK; | ||
104 | } | 102 | } |
105 | 103 | ||
106 | static struct pmu_sleep_notifier via_pmu_led_sleep_notif = { | 104 | static struct pmu_sleep_notifier via_pmu_led_sleep_notif = { |
@@ -120,11 +118,13 @@ static int __init via_pmu_led_init(void) | |||
120 | dt = of_find_node_by_path("/"); | 118 | dt = of_find_node_by_path("/"); |
121 | if (dt == NULL) | 119 | if (dt == NULL) |
122 | return -ENODEV; | 120 | return -ENODEV; |
123 | model = get_property(dt, "model", NULL); | 121 | model = of_get_property(dt, "model", NULL); |
124 | if (model == NULL) | 122 | if (model == NULL) |
125 | return -ENODEV; | 123 | return -ENODEV; |
126 | if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && | 124 | if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 && |
127 | strncmp(model, "iBook", strlen("iBook")) != 0) { | 125 | strncmp(model, "iBook", strlen("iBook")) != 0 && |
126 | strcmp(model, "PowerMac7,2") != 0 && | ||
127 | strcmp(model, "PowerMac7,3") != 0) { | ||
128 | of_node_put(dt); | 128 | of_node_put(dt); |
129 | /* ignore */ | 129 | /* ignore */ |
130 | return -ENODEV; | 130 | return -ENODEV; |