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 | da167876bd0f71f1c646e5dd98997544d8d90e8e (patch) | |
tree | f88797e025ce8206867cbc800c25917480d0a7c7 /drivers/ide | |
parent | fe11edfaabf1787c05d782a7b33e6497d1118b1d (diff) |
ide: IDE_AFLAG_WP -> IDE_DFLAG_WP
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')
-rw-r--r-- | drivers/ide/ide-floppy.c | 8 |
1 files changed, 4 insertions, 4 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) | |||
410 | } | 410 | } |
411 | 411 | ||
412 | if (pc.buf[3] & 0x80) | 412 | if (pc.buf[3] & 0x80) |
413 | drive->atapi_flags |= IDE_AFLAG_WP; | 413 | drive->dev_flags |= IDE_DFLAG_WP; |
414 | else | 414 | else |
415 | drive->atapi_flags &= ~IDE_AFLAG_WP; | 415 | drive->dev_flags &= ~IDE_DFLAG_WP; |
416 | 416 | ||
417 | set_disk_ro(disk, !!(drive->atapi_flags & IDE_AFLAG_WP)); | 417 | set_disk_ro(disk, !!(drive->dev_flags & IDE_DFLAG_WP)); |
418 | 418 | ||
419 | page = &pc.buf[8]; | 419 | page = &pc.buf[8]; |
420 | 420 | ||
@@ -684,7 +684,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp) | |||
684 | goto out_put_floppy; | 684 | goto out_put_floppy; |
685 | } | 685 | } |
686 | 686 | ||
687 | if ((drive->atapi_flags & IDE_AFLAG_WP) && (filp->f_mode & 2)) { | 687 | if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) { |
688 | ret = -EROFS; | 688 | ret = -EROFS; |
689 | goto out_put_floppy; | 689 | goto out_put_floppy; |
690 | } | 690 | } |