Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / macintosh / via-pmu.c

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 62212358640d31f8a24c90a9b66015aae9526100..f9512bfa6c3c7d86ec14da2309b54804b882f057 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -329,6 +329,7 @@ int __init find_via_pmu(void)
                                gaddr = of_translate_address(gpiop, reg);
                        if (gaddr != OF_BAD_ADDR)
                                gpio_reg = ioremap(gaddr, 0x10);
+                       of_node_put(gpiop);
                }
                if (gpio_reg == NULL) {
                        printk(KERN_ERR "via-pmu: Can't find GPIO reg !\n");
@@ -2111,7 +2112,7 @@ pmu_read(struct file *file, char __user *buf,
 
        spin_lock_irqsave(&pp->lock, flags);
        add_wait_queue(&pp->wait, &wait);
-       current->state = TASK_INTERRUPTIBLE;
+       set_current_state(TASK_INTERRUPTIBLE);
 
        for (;;) {
                ret = -EAGAIN;
@@ -2140,7 +2141,7 @@ pmu_read(struct file *file, char __user *buf,
                schedule();
                spin_lock_irqsave(&pp->lock, flags);
        }
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
        remove_wait_queue(&pp->wait, &wait);
        spin_unlock_irqrestore(&pp->lock, flags);