6 files changed, 7 insertions, 6 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 2e305714c209..4e58b9e7a58a 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -191,7 +191,7 @@ int ide_set_media_lock(ide_drive_t *drive, struct gendisk *disk, int on)
 {
         struct ide_atapi_pc pc;
 
-        if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK)
+        if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0)
                 return 0;
 
         ide_init_pc(&pc);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 7dc1a17a4dd8..2f4cc10391e5 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1732,7 +1732,7 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)
                 return 0;
 
         if ((buf[8 + 6] & 0x01) == 0)
-                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
+                drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
         if (buf[8 + 6] & 0x08)
                 drive->atapi_flags &= ~IDE_AFLAG_NO_EJECT;
         if (buf[8 + 3] & 0x01)
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index 37d89ead13dd..df3df0041eb6 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -136,7 +136,7 @@ int ide_cd_lockdoor(ide_drive_t *drive, int lockflag,
                 sense = &my_sense;
 
         /* If the drive cannot lock the door, just pretend. */
-        if (drive->atapi_flags & IDE_AFLAG_NO_DOORLOCK) {
+        if ((drive->dev_flags & IDE_DFLAG_DOORLOCKING) == 0) {
                 stat = 0;
         } else {
                 unsigned char cmd[BLK_MAX_CDB];
@@ -157,7 +157,7 @@ int ide_cd_lockdoor(ide_drive_t *drive, int lockflag,
             (sense->asc == 0x24 || sense->asc == 0x20)) {
                 printk(KERN_ERR "%s: door locking not supported\n",
                         drive->name);
-                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
+                drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
                 stat = 0;
         }
 
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 2cf98b531fd9..791a9d6f371c 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -592,7 +592,7 @@ static void idefloppy_setup(ide_drive_t *drive)
                 blk_queue_max_sectors(drive->queue, 64);
                 drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE;
                 /* IOMEGA Clik! drives do not support lock/unlock commands */
-                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
+                drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
         }
 
         (void) ide_floppy_get_capacity(drive);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 19f8c7770a25..1649ea54f76c 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -208,6 +208,7 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
                 drive->ready_stat = 0;
                 if (ata_id_cdb_intr(id))
                         drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT;
+                drive->dev_flags |= IDE_DFLAG_DOORLOCKING;
                 /* we don't do head unloading on ATAPI devices */
                 drive->dev_flags |= IDE_DFLAG_NO_UNLOAD;
                 return;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index d879c7797cde..a99e28f45156 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2108,7 +2108,7 @@ static void idetape_get_mode_sense_results(ide_drive_t *drive)
 
         /* device lacks locking support according to capabilities page */
         if ((caps[6] & 1) == 0)
-                drive->atapi_flags |= IDE_AFLAG_NO_DOORLOCK;
+                drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
 
         if (caps[7] & 0x02)
                 tape->blk_size = 512;