drm: Fix hashtab implementation leaking illegal error codes to user space.

[linux-2.6-omap-h63xx.git] / drivers / char / nwbutton.c

diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 94845dd12ca90230c31f5a29a3b5b6e6fa919b78..7c57ebfa8640a578d2840ba00a38cef5388eb761 100644 (file)
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -183,7 +183,7 @@ static int button_read (struct file *filp, char __user *buffer,
  * attempts to perform these operations on the device.
  */
 
-static struct file_operations button_fops = {
+static const struct file_operations button_fops = {
        .owner          = THIS_MODULE,
        .read           = button_read,
 };
@@ -223,7 +223,7 @@ static int __init nwbutton_init(void)
                return -EBUSY;
        }
 
-       if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, SA_INTERRUPT,
+       if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED,
                        "nwbutton", NULL)) {
                printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",
                                IRQ_NETWINDER_BUTTON);