floppy: fix open(O_ACCMODE) for ioctl-only open

[cascardo/linux.git] / drivers / block / floppy.c

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index c557057..b71a9c7 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3663,11 +3663,6 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
 
        opened_bdev[drive] = bdev;
 
-       if (!(mode & (FMODE_READ|FMODE_WRITE))) {
-               res = -EINVAL;
-               goto out;
-       }
-
        res = -ENXIO;
 
        if (!floppy_track_buffer) {
@@ -3711,13 +3706,15 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
        if (UFDCS->rawcmd == 1)
                UFDCS->rawcmd = 2;
 
-       UDRS->last_checked = 0;
-       clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
-       check_disk_change(bdev);
-       if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
-               goto out;
-       if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
-               goto out;
+       if (mode & (FMODE_READ|FMODE_WRITE)) {
+               UDRS->last_checked = 0;
+               clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
+               check_disk_change(bdev);
+               if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
+                       goto out;
+               if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
+                       goto out;
+       }
 
        res = -EROFS;