aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/s390/block/dasd_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index e1dc0ffee027..d0c2d732dcff 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -260,7 +260,7 @@ dasd_ioctl_information(struct dasd_device *device,
260 if (!device->discipline->fill_info) 260 if (!device->discipline->fill_info)
261 return -EINVAL; 261 return -EINVAL;
262 262
263 dasd_info = kmalloc(sizeof(struct dasd_information2_t), GFP_KERNEL); 263 dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
264 if (dasd_info == NULL) 264 if (dasd_info == NULL)
265 return -ENOMEM; 265 return -ENOMEM;
266 266
@@ -303,8 +303,7 @@ dasd_ioctl_information(struct dasd_device *device,
303 memcpy(dasd_info->type, device->discipline->name, 4); 303 memcpy(dasd_info->type, device->discipline->name, 4);
304 else 304 else
305 memcpy(dasd_info->type, "none", 4); 305 memcpy(dasd_info->type, "none", 4);
306 dasd_info->req_queue_len = 0; 306
307 dasd_info->chanq_len = 0;
308 if (device->request_queue->request_fn) { 307 if (device->request_queue->request_fn) {
309 struct list_head *l; 308 struct list_head *l;
310#ifdef DASD_EXTENDED_PROFILING 309#ifdef DASD_EXTENDED_PROFILING