Typo fix. We need bitwise-OR here. Greg, please apply.
Matt
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.690 -> 1.691
# drivers/usb/storage/usb.h 1.32 -> 1.33
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/01 [EMAIL PROTECTED] 1.691
# Typo fix. We should be using bitwise-OR instead of logical-OR.
# --------------------------------------------
#
diff -Nru a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
--- a/drivers/usb/storage/usb.h Sun Jun 1 13:43:39 2003
+++ b/drivers/usb/storage/usb.h Sun Jun 1 13:43:39 2003
@@ -82,7 +82,7 @@
#define US_FLIDX_SG_ACTIVE 19 /* 0x00080000 current_sg is in use */
#define US_FLIDX_ABORTING 20 /* 0x00100000 abort is in progress */
#define US_FLIDX_DISCONNECTING 21 /* 0x00200000 disconnect in progress */
-#define DONT_SUBMIT ((1UL << US_FLIDX_ABORTING) || \
+#define DONT_SUBMIT ((1UL << US_FLIDX_ABORTING) | \
(1UL << US_FLIDX_DISCONNECTING))
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
It was a new hope.
-- Dust Puppy
User Friendly, 12/25/1998
pgp00000.pgp
Description: PGP signature
