Merge /spare/repo/linux-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index 61deda04e39e..159149321b3c 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -60,9 +60,8 @@ struct pm_dev *pm_register(pm_dev_t type,
                            unsigned long id,
                            pm_callback callback)
 {
-        struct pm_dev *dev = kmalloc(sizeof(struct pm_dev), GFP_KERNEL);
+        struct pm_dev *dev = kzalloc(sizeof(struct pm_dev), GFP_KERNEL);
         if (dev) {
-                memset(dev, 0, sizeof(*dev));
                 dev->type = type;
                 dev->id = id;
                 dev->callback = callback;