Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next

[deliverable/linux.git] / drivers / target / target_core_tpg.c

diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c
index e320ec24aa1bf81f10a471d677f1363c187f9919..8bd58e284185bab23b8df5d4a554eeae945c8b04 100644 (file)
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@ -153,10 +153,7 @@ void core_tpg_add_node_to_devs(
                 * demo_mode_write_protect is ON, or READ_ONLY;
                 */
                if (!tpg->se_tpg_tfo->tpg_check_demo_mode_write_protect(tpg)) {
-                       if (dev->dev_flags & DF_READ_ONLY)
-                               lun_access = TRANSPORT_LUNFLAGS_READ_ONLY;
-                       else
-                               lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
+                       lun_access = TRANSPORT_LUNFLAGS_READ_WRITE;
                } else {
                        /*
                         * Allow only optical drives to issue R/W in default RO