---

yaml --- r: 23377 b: refs/heads/master c: 554a826 h: refs/heads/master i: 23375: 3941a5b v: v3
git-mirror · Mar 24, 2006 · 24eadc9 · 24eadc9
1 parent b797f9d
commit 24eadc9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0b2eaa374afd10960a507a3f2ce2f24b85826e4
+refs/heads/master: 554a826e0a29f1a88e5a5332f0718c059885ec17
diff --git a/trunk/drivers/s390/block/dasd_ioctl.c b/trunk/drivers/s390/block/dasd_ioctl.c
@@ -260,7 +260,7 @@ dasd_ioctl_information(struct dasd_device *device,
 	if (!device->discipline->fill_info)
 		return -EINVAL;
 
-	dasd_info = kmalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
+	dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
 	if (dasd_info == NULL)
 		return -ENOMEM;
 
@@ -303,8 +303,7 @@ dasd_ioctl_information(struct dasd_device *device,
 		memcpy(dasd_info->type, device->discipline->name, 4);
 	else
 		memcpy(dasd_info->type, "none", 4);
-	dasd_info->req_queue_len = 0;
-	dasd_info->chanq_len = 0;
+
 	if (device->request_queue->request_fn) {
 		struct list_head *l;
 #ifdef DASD_EXTENDED_PROFILING