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

Commit 8b384b81 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

parents dbd43d08 65200c29

drivers/s390/char/tape_class.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ struct tape_class_device *register_tape_dev( 
				device,

				"%s", tcd->device_name

			);

	rc = PTR_ERR(tcd->class_device);

	rc = IS_ERR(tcd->class_device) ? PTR_ERR(tcd->class_device) : 0;

	if (rc)

		goto fail_with_cdev;

	rc = sysfs_create_link(

drivers/s390/cio/device_fsm.c

+1 −0
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event) 
	stsch(sch->schid, &sch->schib);



	if (sch->schib.scsw.actl != 0 ||

	    (sch->schib.scsw.stctl & SCSW_STCTL_STATUS_PEND) ||

	    (cdev->private->irb.scsw.stctl & SCSW_STCTL_STATUS_PEND)) {

		/*

		 * No final status yet or final status not yet delivered

drivers/s390/cio/device_ops.c

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb) 
	/* Abuse intparm for error reporting. */

	if (IS_ERR(irb))

		cdev->private->intparm = -EIO;

	else if (irb->scsw.cc == 1)

		/* Retry for deferred condition code. */

		cdev->private->intparm = -EAGAIN;

	else if ((irb->scsw.dstat !=

		  (DEV_STAT_CHN_END|DEV_STAT_DEV_END)) ||

		 (irb->scsw.cstat != 0)) {