Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cadb78b authored by Cornelia Huck's avatar Cornelia Huck Committed by Linus Torvalds
Browse files

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 54330456

drivers/s390/cio/device.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/s390/cio/device_status.c

+0 −1
Original line number Diff line number Diff line
@@ -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;