diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2006-02-17 13:52:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 13:59:27 -0800 |
| commit | 6cadb78b3bec0a439a99db8fb550dc568e924ae6 (patch) | |
| tree | 0872aba76a7ea0e0d06a2fe172b5334b6b77f5a5 | |
| parent | 54330456b2e3398743586254f6d7695061ea0d49 (diff) | |
| download | kernel_samsung_smdk4412-6cadb78b3bec0a439a99db8fb550dc568e924ae6.zip kernel_samsung_smdk4412-6cadb78b3bec0a439a99db8fb550dc568e924ae6.tar.gz kernel_samsung_smdk4412-6cadb78b3bec0a439a99db8fb550dc568e924ae6.tar.bz2 | |
[PATCH] s390: fix assignment instead of check in ccw_device_set_online()
Fix assignment instead of check in ccw_device_set_online(). Also remove
unneeded assignment in ccw_device_do_sense().
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/s390/cio/device.c | 2 | ||||
| -rw-r--r-- | drivers/s390/cio/device_status.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 062fb10..afc4e88 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -359,7 +359,7 @@ ccw_device_set_online(struct ccw_device *cdev) else pr_debug("ccw_device_offline returned %d, device %s\n", ret, cdev->dev.bus_id); - return (ret = 0) ? -ENODEV : ret; + return (ret == 0) ? -ENODEV : ret; } static ssize_t diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index dad4dd9..6c762b4 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c @@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb) /* * We have ending status but no sense information. Do a basic sense. */ - sch = to_subchannel(cdev->dev.parent); sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE; sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw); sch->sense_ccw.count = SENSE_MAX_COUNT; |