Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_gpio.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c
index 8881182a47237af43b151267b337f0bee1ddd6d3..ded74e555e5f67b83a84fa67e86e0de4cf1e39d5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -302,7 +302,7 @@ nouveau_gpio_isr_del(struct drm_device *dev, int idx, u8 tag, u8 line,
                spin_unlock_irqrestore(&pgpio->lock, flags);
 
                list_for_each_entry_safe(isr, tmp, &tofree, head) {
-                       flush_work_sync(&isr->work);
+                       flush_work(&isr->work);
                        kfree(isr);
                }
        }