[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>

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 062fb100d94c17035c5b0cd30ef47930637f9e3e..afc4e88551ad2ee5437a1622143d95c371522659 100644 (file)
--- 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 dad4dd9887c9eaa4e64f4bc923be24839a114a1f..6c762b43f921cf5f063d3499e91d70efa1615dbb 100644 (file)
--- 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;