diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/s390/block/dasd_erp.c | |
parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/block/dasd_erp.c')
-rw-r--r-- | drivers/s390/block/dasd_erp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c index 8fd71ab02ef0..b842377cb0c6 100644 --- a/drivers/s390/block/dasd_erp.c +++ b/drivers/s390/block/dasd_erp.c | |||
@@ -32,9 +32,8 @@ dasd_alloc_erp_request(char *magic, int cplength, int datasize, | |||
32 | int size; | 32 | int size; |
33 | 33 | ||
34 | /* Sanity checks */ | 34 | /* Sanity checks */ |
35 | if ( magic == NULL || datasize > PAGE_SIZE || | 35 | BUG_ON( magic == NULL || datasize > PAGE_SIZE || |
36 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE) | 36 | (cplength*sizeof(struct ccw1)) > PAGE_SIZE); |
37 | BUG(); | ||
38 | 37 | ||
39 | size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; | 38 | size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; |
40 | if (cplength > 0) | 39 | if (cplength > 0) |
@@ -125,8 +124,7 @@ dasd_default_erp_postaction(struct dasd_ccw_req * cqr) | |||
125 | struct dasd_device *device; | 124 | struct dasd_device *device; |
126 | int success; | 125 | int success; |
127 | 126 | ||
128 | if (cqr->refers == NULL || cqr->function == NULL) | 127 | BUG_ON(cqr->refers == NULL || cqr->function == NULL); |
129 | BUG(); | ||
130 | 128 | ||
131 | device = cqr->device; | 129 | device = cqr->device; |
132 | success = cqr->status == DASD_CQR_DONE; | 130 | success = cqr->status == DASD_CQR_DONE; |