diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:11 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:11 -0400 |
commit | fe11edfaabf1787c05d782a7b33e6497d1118b1d (patch) | |
tree | bf58cca2c2e635e54acf67079bdb4ed26790a84a /drivers/ide/ide-floppy.c | |
parent | 6f84083bbb7d206c8555e5834a2c9b887452fd54 (diff) |
ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGED
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 3271e56d091c..df410c7191ac 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -689,8 +689,8 @@ static int idefloppy_open(struct inode *inode, struct file *filp) | |||
689 | goto out_put_floppy; | 689 | goto out_put_floppy; |
690 | } | 690 | } |
691 | 691 | ||
692 | drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED; | ||
693 | ide_set_media_lock(drive, disk, 1); | 692 | ide_set_media_lock(drive, disk, 1); |
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->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) { |
696 | ret = -EBUSY; | 696 | ret = -EBUSY; |
@@ -747,8 +747,8 @@ static int idefloppy_media_changed(struct gendisk *disk) | |||
747 | drive->dev_flags &= ~IDE_DFLAG_ATTACH; | 747 | drive->dev_flags &= ~IDE_DFLAG_ATTACH; |
748 | return 0; | 748 | return 0; |
749 | } | 749 | } |
750 | ret = !!(drive->atapi_flags & IDE_AFLAG_MEDIA_CHANGED); | 750 | ret = !!(drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED); |
751 | drive->atapi_flags &= ~IDE_AFLAG_MEDIA_CHANGED; | 751 | drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED; |
752 | return ret; | 752 | return ret; |
753 | } | 753 | } |
754 | 754 | ||