Author: pulkomandy Date: 2010-08-28 11:35:15 +0200 (Sat, 28 Aug 2010) New Revision: 38413 Changeset: http://dev.haiku-os.org/changeset/38413 Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp Log: Fix gcc4 build as well as logic error : the driver needlessly scanned some devices. Modified: haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp 2010-08-28 09:23:26 UTC (rev 38412) +++ haiku/trunk/src/add-ons/kernel/drivers/disk/usb/usb_floppy/usb_disk.cpp 2010-08-28 09:35:15 UTC (rev 38413) @@ -595,7 +595,7 @@ 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;