Pull battery into release branch

[karo-tx-linux.git] / block / as-iosched.c

diff --git a/block/as-iosched.c b/block/as-iosched.c
index 109e91b91ffaa403dcb56e828798d923ebec0a50..3e316dd7252981549e2ddbea8a0c0a08dad3370a 100644 (file)
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -1322,10 +1322,9 @@ static void *as_init_queue(request_queue_t *q)
 {
        struct as_data *ad;
 
-       ad = kmalloc_node(sizeof(*ad), GFP_KERNEL, q->node);
+       ad = kmalloc_node(sizeof(*ad), GFP_KERNEL | __GFP_ZERO, q->node);
        if (!ad)
                return NULL;
-       memset(ad, 0, sizeof(*ad));
 
        ad->q = q; /* Identify what queue the data belongs to */