Merge with /shiny/git/linux-2.6/.git

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 9b7f6f548b1d..ee7a05e0c3ba 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -235,6 +235,9 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                 sch->schib.pmcw.pam &
                 sch->schib.pmcw.pom &
                 sch->opm;
+        /* Check since device may again have become not operational. */
+        if (!sch->schib.pmcw.dnv)
+                state = DEV_STATE_NOT_OPER;
         if (cdev->private->state == DEV_STATE_DISCONNECTED_SENSE_ID)
                 /* Force reprobe on all chpids. */
                 old_lpm = 0;