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_proc.c | |
| parent | fnctl: f_modown should call write_lock_irqsave/restore (diff) | |
| download | linux-294001a80c9810e2fe27aaaad7df8be12a103065.tar.gz linux-294001a80c9810e2fe27aaaad7df8be12a103065.tar.bz2 linux-294001a80c9810e2fe27aaaad7df8be12a103065.zip | |
[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_proc.c')
| -rw-r--r-- | drivers/s390/block/dasd_proc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index 6315fbd8e68b..71f95f54866f 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c @@ -72,7 +72,7 @@ dasd_devices_show(struct seq_file *m, void *v) /* Print device number. */ seq_printf(m, "%s", dev_name(&device->cdev->dev)); /* Print discipline string. */ - if (device != NULL && device->discipline != NULL) + if (device->discipline != NULL) seq_printf(m, "(%s)", device->discipline->name); else seq_printf(m, "(none)"); @@ -92,10 +92,7 @@ dasd_devices_show(struct seq_file *m, void *v) substr = (device->features & DASD_FEATURE_READONLY) ? "(ro)" : " "; seq_printf(m, "%4s: ", substr); /* Print device status information. */ - switch ((device != NULL) ? device->state : -1) { - case -1: - seq_printf(m, "unknown"); - break; + switch (device->state) { case DASD_STATE_NEW: seq_printf(m, "new"); break; |