From 81f8c8607d6ffcfdfb47cfa3b1cd2b55a4577218 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 27 Dec 2012 16:42:47 +0100
Subject: 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.
---
 linux/dev/drivers/block/floppy.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/dev/drivers/block/floppy.c')

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");
-- 
cgit v1.2.3