summaryrefslogtreecommitdiff
path: root/linux/dev
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-12-27 16:42:47 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-12-27 16:42:47 +0100
commit81f8c8607d6ffcfdfb47cfa3b1cd2b55a4577218 (patch)
tree3423325b0ef811ad6919b16514bc9d390a00fc78 /linux/dev
parent769b0946b81a11ea495d94cdf6768837a3602998 (diff)
Fix spurious error on accessing fd1
Cherry picked from Linux kernel commit 76c25284e0d845bff4ee1031721556148af4db1c * linux/dev/drivers/block/floppy.c (config_types): Clear from `allowed_drive_mask' floppy drives whose cmos type is 0.
Diffstat (limited to 'linux/dev')
-rw-r--r--linux/dev/drivers/block/floppy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/dev/drivers/block/floppy.c b/linux/dev/drivers/block/floppy.c
index 83943ee..4c0977a 100644
--- a/linux/dev/drivers/block/floppy.c
+++ b/linux/dev/drivers/block/floppy.c
@@ -3492,6 +3492,8 @@ static void config_types(void)
printk("fd%d is unknown type %d",drive,
UDP->cmos);
}
+ else
+ allowed_drive_mask &= ~(1 << drive);
}
if (!first)
printk("\n");