Please pull git390 'for-linus' branch
Subsystems (2)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
drivers/s390/char/tape_class.c | 2 +- drivers/s390/cio/device_fsm.c | 1 + drivers/s390/cio/device_ops.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-)
Cornelia Huck:
[S390] retry after deferred condition code.
Heiko Carstens:
[S390] tape class return value handling.
Peter Oberparleiter:
[S390] lost interrupt after chpid vary off/on cycle.
drivers/s390/char/tape_class.c +1 -1
@@ -76,7 +76,7 @@ struct tape_class_device *register_tape_ 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
@@ -772,6 +772,7 @@ ccw_device_online_verify(struct ccw_devistsch (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
@@ -263,6 +263,9 @@ ccw_device_wake_up(struct ccw_device *cd/* 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 )) {
Quoted 3 lines · Martin Schwidefsky
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
Pulled into my tree, thanks.
greg k-h