Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers
[linux-3.10.git] / drivers / gpu / drm / nouveau / nouveau_gpio.c
index 8881182..ded74e5 100644 (file)
@@ -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);
                }
        }