5 files changed, 15 insertions, 22 deletions

diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index f27d0d0816d3..4b71647782d0 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -171,7 +171,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
         }
         got_gatt = 1;
 
-        bridge->key_list = vmalloc(PAGE_SIZE * 4);
+        bridge->key_list = vzalloc(PAGE_SIZE * 4);
         if (bridge->key_list == NULL) {
                 dev_err(&bridge->dev->dev,
                         "can't allocate memory for key lists\n");
@@ -181,7 +181,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
         got_keylist = 1;
 
         /* FIXME vmalloc'd memory not guaranteed contiguous */
-        memset(bridge->key_list, 0, PAGE_SIZE * 4);
 
         if (bridge->driver->configure()) {
                 dev_err(&bridge->dev->dev, "error configuring host chipset\n");
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index a7346ab97a3c..f4837a893dfa 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -40,10 +40,7 @@
 #define APM_MINOR_DEV   134
 
 /*
- * See Documentation/Config.help for the configuration options.
- *
- * Various options can be changed at boot time as follows:
- * (We allow underscores for compatibility with the modules code)
+ * One option can be changed at boot time as follows:
  *      apm=on/off                      enable/disable APM
  */
 
@@ -300,17 +297,13 @@ apm_ioctl(struct file *filp, u_int cmd, u_long arg)
                         /*
                          * Wait for the suspend/resume to complete.  If there
                          * are pending acknowledges, we wait here for them.
+                         * wait_event_freezable() is interruptible and pending
+                         * signal can cause busy looping.  We aren't doing
+                         * anything critical, chill a bit on each iteration.
                          */
-                        freezer_do_not_count();
-
-                        wait_event(apm_suspend_waitqueue,
-                                   as->suspend_state == SUSPEND_DONE);
-
-                        /*
-                         * Since we are waiting until the suspend is done, the
-                         * try_to_freeze() in freezer_count() will not trigger
-                         */
-                        freezer_count();
+                        while (wait_event_freezable(apm_suspend_waitqueue,
+                                        as->suspend_state == SUSPEND_DONE))
+                                msleep(10);
                         break;
                 case SUSPEND_ACKTO:
                         as->suspend_result = -ETIMEDOUT;
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index b33e8ea314ed..b6de2c047145 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -324,13 +324,12 @@ static int __init raw_init(void)
                 max_raw_minors = MAX_RAW_MINORS;
         }
 
-        raw_devices = vmalloc(sizeof(struct raw_device_data) * max_raw_minors);
+        raw_devices = vzalloc(sizeof(struct raw_device_data) * max_raw_minors);
         if (!raw_devices) {
                 printk(KERN_ERR "Not enough memory for raw device structures\n");
                 ret = -ENOMEM;
                 goto error;
         }
-        memset(raw_devices, 0, sizeof(struct raw_device_data) * max_raw_minors);
 
         ret = register_chrdev_region(dev, max_raw_minors, "raw");
         if (ret)
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index dfa8b3062fda..ccd124ab7ca7 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -80,6 +80,7 @@
 #include <linux/bcd.h>
 #include <linux/delay.h>
 #include <linux/uaccess.h>
+#include <linux/ratelimit.h>
 
 #include <asm/current.h>
 #include <asm/system.h>
@@ -1195,10 +1196,8 @@ static void rtc_dropped_irq(unsigned long data)
 
         spin_unlock_irq(&rtc_lock);
 
-        if (printk_ratelimit()) {
-                printk(KERN_WARNING "rtc: lost some interrupts at %ldHz.\n",
-                        freq);
-        }
+        printk_ratelimited(KERN_WARNING "rtc: lost some interrupts at %ldHz.\n",
+                           freq);
 
         /* Now we have new data */
         wake_up_interruptible(&rtc_wait);
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 9ca5c021d0b6..361a1dff8f77 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -966,6 +966,9 @@ ssize_t tpm_show_durations(struct device *dev, struct device_attribute *attr,
 {
         struct tpm_chip *chip = dev_get_drvdata(dev);
 
+        if (chip->vendor.duration[TPM_LONG] == 0)
+                return 0;
+
         return sprintf(buf, "%d %d %d [%s]\n",
                        jiffies_to_usecs(chip->vendor.duration[TPM_SHORT]),
                        jiffies_to_usecs(chip->vendor.duration[TPM_MEDIUM]),