Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_eckd.c

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index e0b77210d37a5b95f15b707c39baf42397396ba2..3590fdb5b2fda56ce9e5df1a22f1b59966be7af8 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1418,8 +1418,10 @@ static void dasd_eckd_handle_unsolicited_interrupt(struct dasd_device *device,
 
 
        /* service information message SIM */
-       if ((irb->ecw[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE) {
+       if (irb->esw.esw0.erw.cons && (irb->ecw[27] & DASD_SENSE_BIT_0) &&
+           ((irb->ecw[6] & DASD_SIM_SENSE) == DASD_SIM_SENSE)) {
                dasd_3990_erp_handle_sim(device, irb->ecw);
+               dasd_schedule_device_bh(device);
                return;
        }