summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton2005-11-23 22:37:36 +0100
committerLinus Torvalds2005-11-24 01:08:38 +0100
commitc101e77301877086e6f977fcfb140d1cbbe23fd5 (patch)
tree471198cc41f4e1cb342177934b9ebe9242732e38
parent[PATCH] Check the irq number is within bounds (diff)
downloadkernel-qcow2-linux-c101e77301877086e6f977fcfb140d1cbbe23fd5.tar.gz
kernel-qcow2-linux-c101e77301877086e6f977fcfb140d1cbbe23fd5.tar.xz
kernel-qcow2-linux-c101e77301877086e6f977fcfb140d1cbbe23fd5.zip
[PATCH] revert floppy-fix-read-only-handling
This fix causes problems on the very first floppy access - we haven't yet talked to the FDC so we don't know which state the write-protect tab is in. Revert for now. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/block/floppy.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 13b8a9bed66e..f7e765a1d313 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3714,12 +3714,6 @@ static int floppy_open(struct inode *inode, struct file *filp)
USETF(FD_VERIFY);
}
- /* set underlying gendisk policy to reflect real ro/rw status */
- if (UTESTF(FD_DISK_WRITABLE))
- inode->i_bdev->bd_disk->policy = 0;
- else
- inode->i_bdev->bd_disk->policy = 1;
-
if (UDRS->fd_ref == -1 || (UDRS->fd_ref && (filp->f_flags & O_EXCL)))
goto out2;