From 355a38a0987144473d57257beb5dd9cbe90116ce Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 28 Aug 2010 09:35:15 +0000 Subject: [PATCH] Fix gcc4 build as well as logic error : the driver needlessly scanned some devices. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38413 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp index 2aa8e10822..3b1c52e435 100644 --- a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp @@ -595,7 +595,7 @@ usb_disk_device_added(usb_device newDevice, void **cookie) continue; if (interface->descr->interface_class == 0x08 /* mass storage */ - || interface->descr->interface_subclass == 0x04 /* UFI (floppy) */ + && interface->descr->interface_subclass == 0x04 /* UFI (floppy) */ && interface->descr->interface_protocol == 0x00) { bool hasIn = false;