5 files changed, 87 insertions, 125 deletions

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index c1fe013c64f3..b4af87c6f9c8 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -143,6 +143,7 @@ struct agp_bridge_data {
         char major_version;
         char minor_version;
         struct list_head list;
+        u32 apbase_config;
 };
 
 #define KB(x)   ((x) * 1024)
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 51266d6b4d78..1f7d415f432c 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1047,9 +1047,15 @@ static int intel_845_configure(void)
         /* aperture size */
         pci_write_config_byte(agp_bridge->dev, INTEL_APSIZE, current_size->size_value);
 
-        /* address to map to */
-        pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
-        agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+        if (agp_bridge->apbase_config != 0) {
+                pci_write_config_dword(agp_bridge->dev, AGP_APBASE,
+                                       agp_bridge->apbase_config);
+        } else {
+                /* address to map to */
+                pci_read_config_dword(agp_bridge->dev, AGP_APBASE, &temp);
+                agp_bridge->gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK);
+                agp_bridge->apbase_config = temp;
+        }
 
         /* attbase - aperture base */
         pci_write_config_dword(agp_bridge->dev, INTEL_ATTBASE, agp_bridge->gatt_bus_addr);
diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 7b19e02f112f..523fd3c8bbaa 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -198,10 +198,10 @@ int setkeycode(unsigned int scancode, unsigned int keycode)
 
         if (scancode >= dev->keycodemax)
                 return -EINVAL;
-        if (keycode > KEY_MAX)
-                return -EINVAL;
         if (keycode < 0 || keycode > KEY_MAX)
                 return -EINVAL;
+        if (keycode >> (dev->keycodesize * 8))
+                return -EINVAL;
 
         oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode);
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index fd042060809a..cefbe985e55c 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -439,6 +439,11 @@ static struct {
         { 0, 0 },
 };
 
+struct sonypi_keypress {
+        struct input_dev *dev;
+        int key;
+};
+
 static struct sonypi_device {
         struct pci_dev *dev;
         struct platform_device *pdev;
@@ -710,22 +715,61 @@ static void sonypi_setbluetoothpower(u8 state)
 
 static void input_keyrelease(void *data)
 {
-        struct input_dev *input_dev;
-        int key;
-
-        while (1) {
-                if (kfifo_get(sonypi_device.input_fifo,
-                              (unsigned char *)&input_dev,
-                              sizeof(input_dev)) != sizeof(input_dev))
-                        return;
-                if (kfifo_get(sonypi_device.input_fifo,
-                              (unsigned char *)&key,
-                              sizeof(key)) != sizeof(key))
-                        return;
+        struct sonypi_keypress kp;
 
+        while (kfifo_get(sonypi_device.input_fifo, (unsigned char *)&kp,
+                         sizeof(kp)) == sizeof(kp)) {
                 msleep(10);
-                input_report_key(input_dev, key, 0);
-                input_sync(input_dev);
+                input_report_key(kp.dev, kp.key, 0);
+                input_sync(kp.dev);
+        }
+}
+
+static void sonypi_report_input_event(u8 event)
+{
+        struct input_dev *jog_dev = &sonypi_device.input_jog_dev;
+        struct input_dev *key_dev = &sonypi_device.input_key_dev;
+        struct sonypi_keypress kp = { NULL };
+        int i;
+
+        switch (event) {
+        case SONYPI_EVENT_JOGDIAL_UP:
+        case SONYPI_EVENT_JOGDIAL_UP_PRESSED:
+                input_report_rel(jog_dev, REL_WHEEL, 1);
+                input_sync(jog_dev);
+                break;
+
+        case SONYPI_EVENT_JOGDIAL_DOWN:
+        case SONYPI_EVENT_JOGDIAL_DOWN_PRESSED:
+                input_report_rel(jog_dev, REL_WHEEL, -1);
+                input_sync(jog_dev);
+                break;
+
+        case SONYPI_EVENT_JOGDIAL_PRESSED:
+                kp.key = BTN_MIDDLE;
+                kp.dev = jog_dev;
+                break;
+
+        case SONYPI_EVENT_FNKEY_RELEASED:
+                /* Nothing, not all VAIOs generate this event */
+                break;
+
+        default:
+                for (i = 0; sonypi_inputkeys[i].sonypiev; i++)
+                        if (event == sonypi_inputkeys[i].sonypiev) {
+                                kp.dev = key_dev;
+                                kp.key = sonypi_inputkeys[i].inputev;
+                                break;
+                        }
+                break;
+        }
+
+        if (kp.dev) {
+                input_report_key(kp.dev, kp.key, 1);
+                input_sync(kp.dev);
+                kfifo_put(sonypi_device.input_fifo,
+                          (unsigned char *)&kp, sizeof(kp));
+                schedule_work(&sonypi_device.input_work);
         }
 }
 
@@ -768,51 +812,8 @@ found:
                 printk(KERN_INFO
                        "sonypi: event port1=0x%02x,port2=0x%02x\n", v1, v2);
 
-        if (useinput) {
-                struct input_dev *input_jog_dev = &sonypi_device.input_jog_dev;
-                struct input_dev *input_key_dev = &sonypi_device.input_key_dev;
-                switch (event) {
-                case SONYPI_EVENT_JOGDIAL_UP:
-                case SONYPI_EVENT_JOGDIAL_UP_PRESSED:
-                        input_report_rel(input_jog_dev, REL_WHEEL, 1);
-                        break;
-                case SONYPI_EVENT_JOGDIAL_DOWN:
-                case SONYPI_EVENT_JOGDIAL_DOWN_PRESSED:
-                        input_report_rel(input_jog_dev, REL_WHEEL, -1);
-                        break;
-                case SONYPI_EVENT_JOGDIAL_PRESSED: {
-                        int key = BTN_MIDDLE;
-                        input_report_key(input_jog_dev, key, 1);
-                        kfifo_put(sonypi_device.input_fifo,
-                                  (unsigned char *)&input_jog_dev,
-                                  sizeof(input_jog_dev));
-                        kfifo_put(sonypi_device.input_fifo,
-                                  (unsigned char *)&key, sizeof(key));
-                        break;
-                }
-                case SONYPI_EVENT_FNKEY_RELEASED:
-                        /* Nothing, not all VAIOs generate this event */
-                        break;
-                }
-                input_sync(input_jog_dev);
-
-                for (i = 0; sonypi_inputkeys[i].sonypiev; i++) {
-                        int key;
-
-                        if (event != sonypi_inputkeys[i].sonypiev)
-                                continue;
-
-                        key = sonypi_inputkeys[i].inputev;
-                        input_report_key(input_key_dev, key, 1);
-                        kfifo_put(sonypi_device.input_fifo,
-                                  (unsigned char *)&input_key_dev,
-                                  sizeof(input_key_dev));
-                        kfifo_put(sonypi_device.input_fifo,
-                                  (unsigned char *)&key, sizeof(key));
-                }
-                input_sync(input_key_dev);
-                schedule_work(&sonypi_device.input_work);
-        }
+        if (useinput)
+                sonypi_report_input_event(event);
 
         kfifo_put(sonypi_device.fifo, (unsigned char *)&event, sizeof(event));
         kill_fasync(&sonypi_device.fifo_async, SIGIO, POLL_IN);
@@ -1227,14 +1228,7 @@ static int __devinit sonypi_probe(void)
                 sonypi_device.input_jog_dev.keybit[LONG(BTN_MOUSE)] =
                         BIT(BTN_MIDDLE);
                 sonypi_device.input_jog_dev.relbit[0] = BIT(REL_WHEEL);
-                sonypi_device.input_jog_dev.name =
-                        kmalloc(sizeof(SONYPI_JOG_INPUTNAME), GFP_KERNEL);
-                if (!sonypi_device.input_jog_dev.name) {
-                        printk(KERN_ERR "sonypi: kmalloc failed\n");
-                        ret = -ENOMEM;
-                        goto out_inkmallocinput1;
-                }
-                sprintf(sonypi_device.input_jog_dev.name, SONYPI_JOG_INPUTNAME);
+                sonypi_device.input_jog_dev.name = SONYPI_JOG_INPUTNAME;
                 sonypi_device.input_jog_dev.id.bustype = BUS_ISA;
                 sonypi_device.input_jog_dev.id.vendor = PCI_VENDOR_ID_SONY;
 
@@ -1248,14 +1242,7 @@ static int __devinit sonypi_probe(void)
                         if (sonypi_inputkeys[i].inputev)
                                 set_bit(sonypi_inputkeys[i].inputev,
                                         sonypi_device.input_key_dev.keybit);
-                sonypi_device.input_key_dev.name =
-                        kmalloc(sizeof(SONYPI_KEY_INPUTNAME), GFP_KERNEL);
-                if (!sonypi_device.input_key_dev.name) {
-                        printk(KERN_ERR "sonypi: kmalloc failed\n");
-                        ret = -ENOMEM;
-                        goto out_inkmallocinput2;
-                }
-                sprintf(sonypi_device.input_key_dev.name, SONYPI_KEY_INPUTNAME);
+                sonypi_device.input_key_dev.name = SONYPI_KEY_INPUTNAME;
                 sonypi_device.input_key_dev.id.bustype = BUS_ISA;
                 sonypi_device.input_key_dev.id.vendor = PCI_VENDOR_ID_SONY;
 
@@ -1313,11 +1300,7 @@ out_platformdev:
         kfifo_free(sonypi_device.input_fifo);
 out_infifo:
         input_unregister_device(&sonypi_device.input_key_dev);
-        kfree(sonypi_device.input_key_dev.name);
-out_inkmallocinput2:
         input_unregister_device(&sonypi_device.input_jog_dev);
-        kfree(sonypi_device.input_jog_dev.name);
-out_inkmallocinput1:
         free_irq(sonypi_device.irq, sonypi_irq);
 out_reqirq:
         release_region(sonypi_device.ioport1, sonypi_device.region_size);
@@ -1337,13 +1320,14 @@ static void __devexit sonypi_remove(void)
 {
         sonypi_disable();
 
+        synchronize_sched();  /* Allow sonypi interrupt to complete. */
+        flush_scheduled_work();
+
         platform_device_unregister(sonypi_device.pdev);
 
         if (useinput) {
                 input_unregister_device(&sonypi_device.input_key_dev);
-                kfree(sonypi_device.input_key_dev.name);
                 input_unregister_device(&sonypi_device.input_jog_dev);
-                kfree(sonypi_device.input_jog_dev.name);
                 kfifo_free(sonypi_device.input_fifo);
         }
 
diff --git a/drivers/char/watchdog/sa1100_wdt.c b/drivers/char/watchdog/sa1100_wdt.c
index 1b2132617dc3..fb88b4041dca 100644
--- a/drivers/char/watchdog/sa1100_wdt.c
+++ b/drivers/char/watchdog/sa1100_wdt.c
@@ -36,13 +36,10 @@
 #include <asm/uaccess.h>
 
 #define OSCR_FREQ               CLOCK_TICK_RATE
-#define SA1100_CLOSE_MAGIC      (0x5afc4453)
 
 static unsigned long sa1100wdt_users;
-static int expect_close;
 static int pre_margin;
 static int boot_status;
-static int nowayout = WATCHDOG_NOWAYOUT;
 
 /*
  *      Allow only one person to hold it open
@@ -62,55 +59,33 @@ static int sa1100dog_open(struct inode *inode, struct file *file)
 }
 
 /*
- *      Shut off the timer.
- *      Lock it in if it's a module and we defined ...NOWAYOUT
- *      Oddly, the watchdog can only be enabled, but we can turn off
- *      the interrupt, which appears to prevent the watchdog timing out.
+ * The watchdog cannot be disabled.
+ *
+ * Previous comments suggested that turning off the interrupt by
+ * clearing OIER[E3] would prevent the watchdog timing out but this
+ * does not appear to be true (at least on the PXA255).
  */
 static int sa1100dog_release(struct inode *inode, struct file *file)
 {
-        OSMR3 = OSCR + pre_margin;
-
-        if (expect_close == SA1100_CLOSE_MAGIC) {
-                OIER &= ~OIER_E3;
-        } else {
-                printk(KERN_CRIT "WATCHDOG: WDT device closed unexpectedly.  WDT will not stop!\n");
-        }
+        printk(KERN_CRIT "WATCHDOG: Device closed - timer will not stop\n");
 
         clear_bit(1, &sa1100wdt_users);
-        expect_close = 0;
 
         return 0;
 }
 
 static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
 {
-        if (len) {
-                if (!nowayout) {
-                        size_t i;
-
-                        expect_close = 0;
-
-                        for (i = 0; i != len; i++) {
-                                char c;
-
-                                if (get_user(c, data + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        expect_close = SA1100_CLOSE_MAGIC;
-                        }
-                }
+        if (len)
                 /* Refresh OSMR3 timer. */
                 OSMR3 = OSCR + pre_margin;
-        }
 
         return len;
 }
 
 static struct watchdog_info ident = {
-        .options        = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
-                          WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
-        .identity       = "SA1100 Watchdog",
+        .options        = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
+        .identity       = "SA1100/PXA255 Watchdog",
 };
 
 static int sa1100dog_ioctl(struct inode *inode, struct file *file,
@@ -172,7 +147,7 @@ static struct file_operations sa1100dog_fops =
 static struct miscdevice sa1100dog_miscdev =
 {
         .minor          = WATCHDOG_MINOR,
-        .name           = "SA1100/PXA2xx watchdog",
+        .name           = "watchdog",
         .fops           = &sa1100dog_fops,
 };
 
@@ -194,7 +169,6 @@ static int __init sa1100dog_init(void)
         if (ret == 0)
                 printk("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
                        margin);
-
         return ret;
 }
 
@@ -212,8 +186,5 @@ MODULE_DESCRIPTION("SA1100/PXA2xx Watchdog");
 module_param(margin, int, 0);
 MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");
 
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
-
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);