2 files changed, 1 insertions, 2 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 062fb100d94c..afc4e88551ad 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 dad4dd9887c9..6c762b43f921 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;