Messages in this thread Patch in this message | | | Date | Thu, 16 Feb 2006 17:41:33 +0100 | From | Heiko Carstens <> | Subject | [patch 2/3] s390: fix assignment instead of check in ccw_device_set_online() |
| |
From: Cornelia Huck <cornelia.huck@de.ibm.com>
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> ---
drivers/s390/cio/device.c | 2 +- drivers/s390/cio/device_status.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
diff -urpN linux-2.6/drivers/s390/cio/device.c linux-2.6-patched/drivers/s390/cio/device.c --- linux-2.6/drivers/s390/cio/device.c 2006-02-16 17:10:40.000000000 +0100 +++ linux-2.6-patched/drivers/s390/cio/device.c 2006-02-16 17:11:00.000000000 +0100 @@ -359,7 +359,7 @@ ccw_device_set_online(struct ccw_device 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 -urpN linux-2.6/drivers/s390/cio/device_status.c linux-2.6-patched/drivers/s390/cio/device_status.c --- linux-2.6/drivers/s390/cio/device_status.c 2006-02-16 17:10:40.000000000 +0100 +++ linux-2.6-patched/drivers/s390/cio/device_status.c 2006-02-16 17:11:00.000000000 +0100 @@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *c /* * 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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |