aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/dasd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 7967916bda18..0a9f12c4e911 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -541,9 +541,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
541 struct dasd_ccw_req *cqr; 541 struct dasd_ccw_req *cqr;
542 542
543 /* Sanity checks */ 543 /* Sanity checks */
544 if ( magic == NULL || datasize > PAGE_SIZE || 544 BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
545 (cplength*sizeof(struct ccw1)) > PAGE_SIZE) 545 (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
546 BUG();
547 546
548 cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC); 547 cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
549 if (cqr == NULL) 548 if (cqr == NULL)
@@ -583,9 +582,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
583 int size; 582 int size;
584 583
585 /* Sanity checks */ 584 /* Sanity checks */
586 if ( magic == NULL || datasize > PAGE_SIZE || 585 BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
587 (cplength*sizeof(struct ccw1)) > PAGE_SIZE) 586 (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
588 BUG();
589 587
590 size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; 588 size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
591 if (cplength > 0) 589 if (cplength > 0)