2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index df410c7191ac..8078e0826cd3 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -410,11 +410,11 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
         }
 
         if (pc.buf[3] & 0x80)
-                drive->atapi_flags |= IDE_AFLAG_WP;
+                drive->dev_flags |= IDE_DFLAG_WP;
         else
-                drive->atapi_flags &= ~IDE_AFLAG_WP;
+                drive->dev_flags &= ~IDE_DFLAG_WP;
 
-        set_disk_ro(disk, !!(drive->atapi_flags & IDE_AFLAG_WP));
+        set_disk_ro(disk, !!(drive->dev_flags & IDE_DFLAG_WP));
 
         page = &pc.buf[8];
 
@@ -684,7 +684,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                         goto out_put_floppy;
                 }
 
-                if ((drive->atapi_flags & IDE_AFLAG_WP) && (filp->f_mode & 2)) {
+                if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
                         ret = -EROFS;
                         goto out_put_floppy;
                 }
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 155a57f55c60..bd0a4d36b6d3 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -503,8 +503,6 @@ enum {
         IDE_AFLAG_CLIK_DRIVE            = (1 << 19),
         /* Requires BH algorithm for packets */
         IDE_AFLAG_ZIP_DRIVE             = (1 << 20),
-        /* Write protect */
-        IDE_AFLAG_WP                    = (1 << 21),
         /* Supports format progress report */
         IDE_AFLAG_SRFP                  = (1 << 22),
 
@@ -579,6 +577,8 @@ enum {
         /* heads unloaded, please don't reset port */
         IDE_DFLAG_PARKED                = (1 << 28),
         IDE_DFLAG_MEDIA_CHANGED         = (1 << 29),
+        /* write protect */
+        IDE_DFLAG_WP                    = (1 << 30),
 };
 
 struct ide_drive_s {