projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[cascardo/linux.git]
/
drivers
/
macintosh
/
via-pmu.c
diff --git
a/drivers/macintosh/via-pmu.c
b/drivers/macintosh/via-pmu.c
index
f7c509b
..
ac420b1
100644
(file)
--- a/
drivers/macintosh/via-pmu.c
+++ b/
drivers/macintosh/via-pmu.c
@@
-1521,7
+1521,7
@@
pmu_sr_intr(void)
req = current_req;
/*
* For PMU sleep and freq change requests, we lock the
req = current_req;
/*
* For PMU sleep and freq change requests, we lock the
- * PMU until it's explicit
e
ly unlocked. This avoids any
+ * PMU until it's explicitly unlocked. This avoids any
* spurrious event polling getting in
*/
current_req = req->next;
* spurrious event polling getting in
*/
current_req = req->next;
@@
-2336,6
+2336,7
@@
powerbook_sleep_3400(void)
ret = pmac_suspend_devices();
if (ret) {
pbook_free_pci_save();
ret = pmac_suspend_devices();
if (ret) {
pbook_free_pci_save();
+ iounmap(mem_ctrl);
printk(KERN_ERR "Sleep rejected by devices\n");
return ret;
}
printk(KERN_ERR "Sleep rejected by devices\n");
return ret;
}
@@
-2795,7
+2796,7
@@
static int pmu_sys_resume(struct sys_device *sysdev)
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
static struct sysdev_class pmu_sysclass = {
#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
static struct sysdev_class pmu_sysclass = {
-
set_kset_name("pmu")
,
+
.name = "pmu"
,
};
static struct sys_device device_pmu = {
};
static struct sys_device device_pmu = {