aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-17 12:09:11 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-17 12:09:11 -0400
commite01286282eef85e4783b06fb2e0ed84fc111eb32 (patch)
tree7b8abd0e50aa394127051b1303aecf9c1420b6c4 /drivers/ide/ide-floppy.c
parentda167876bd0f71f1c646e5dd98997544d8d90e8e (diff)
ide: IDE_AFLAG_FORMAT_IN_PROGRESS -> IDE_DFLAG_FORMAT_IN_PROGRESS
There should be no functional changes caused by this patch. Acked-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r--drivers/ide/ide-floppy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 8078e0826cd3..2cf98b531fd9 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -664,7 +664,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
664 floppy->openers++; 664 floppy->openers++;
665 665
666 if (floppy->openers == 1) { 666 if (floppy->openers == 1) {
667 drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS; 667 drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
668 /* Just in case */ 668 /* Just in case */
669 669
670 if (ide_do_test_unit_ready(drive, disk)) 670 if (ide_do_test_unit_ready(drive, disk))
@@ -692,7 +692,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
692 ide_set_media_lock(drive, disk, 1); 692 ide_set_media_lock(drive, disk, 1);
693 drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED; 693 drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
694 check_disk_change(inode->i_bdev); 694 check_disk_change(inode->i_bdev);
695 } else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) { 695 } else if (drive->dev_flags & IDE_DFLAG_FORMAT_IN_PROGRESS) {
696 ret = -EBUSY; 696 ret = -EBUSY;
697 goto out_put_floppy; 697 goto out_put_floppy;
698 } 698 }
@@ -714,7 +714,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
714 714
715 if (floppy->openers == 1) { 715 if (floppy->openers == 1) {
716 ide_set_media_lock(drive, disk, 0); 716 ide_set_media_lock(drive, disk, 0);
717 drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS; 717 drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
718 } 718 }
719 719
720 floppy->openers--; 720 floppy->openers--;