diff options
| author | Stefan Haberland <stefan.haberland@de.ibm.com> | 2010-01-27 10:12:35 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-01-27 10:12:48 +0100 |
| commit | 294001a80c9810e2fe27aaaad7df8be12a103065 (patch) | |
| tree | 1615733697057a38054f68bf46109fffeeb5e549 /drivers/s390/block/dasd_eckd.c | |
| parent | b04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff) | |
| download | kernel_samsung_smdk4412-294001a80c9810e2fe27aaaad7df8be12a103065.zip kernel_samsung_smdk4412-294001a80c9810e2fe27aaaad7df8be12a103065.tar.gz kernel_samsung_smdk4412-294001a80c9810e2fe27aaaad7df8be12a103065.tar.bz2 | |
[S390] dasd: fix possible NULL pointer errors
Fix possible NULL pointer in DASD messages and correct discipline
checking.
Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/block/dasd_eckd.c')
| -rw-r--r-- | drivers/s390/block/dasd_eckd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 1c500c4..1cca21a 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -3033,7 +3033,7 @@ static void dasd_eckd_dump_sense_ccw(struct dasd_device *device, len += sprintf(page + len, KERN_ERR PRINTK_HEADER " in req: %p CS: 0x%02X DS: 0x%02X CC: 0x%02X RC: %d\n", req, scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw), - scsw_cc(&irb->scsw), req->intrc); + scsw_cc(&irb->scsw), req ? req->intrc : 0); len += sprintf(page + len, KERN_ERR PRINTK_HEADER " device %s: Failing CCW: %p\n", dev_name(&device->cdev->dev), |