Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...

[karo-tx-linux.git] / drivers / s390 / block / dasd_genhd.c

diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 94f92a1247f2039b19ae29581b7e7c63e155f418..30a1ca3d08b7c03a6d2c5e40a2dd20b67c15bc31 100644 (file)
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -70,7 +70,8 @@ int dasd_gendisk_alloc(struct dasd_block *block)
        }
        len += sprintf(gdp->disk_name + len, "%c", 'a'+(base->devindex%26));
 
-       if (block->base->features & DASD_FEATURE_READONLY)
+       if (base->features & DASD_FEATURE_READONLY ||
+           test_bit(DASD_FLAG_DEVICE_RO, &base->flags))
                set_disk_ro(gdp, 1);
        gdp->private_data = block;
        gdp->queue = block->request_queue;