From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 6 Sep 2009 17:33:50 +0000 (+0200)
Subject: firewire: sbp2: remove a workaround for Momobay FX-3A
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3c5f80357c3fb3170e39e5d0ae87ddd6652f36ac;p=deliverable%2Flinux.git

firewire: sbp2: remove a workaround for Momobay FX-3A

The inquiry delay does more harm than good in tests on a recent kernel.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 8f83bffb43e7..50f0176de615 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -354,8 +354,7 @@ static const struct {
 	/* DViCO Momobay FX-3A with TSB42AA9A bridge */ {
 		.firmware_revision	= 0x002800,
 		.model			= 0x000000,
-		.workarounds		= SBP2_WORKAROUND_DELAY_INQUIRY |
-					  SBP2_WORKAROUND_POWER_CONDITION,
+		.workarounds		= SBP2_WORKAROUND_POWER_CONDITION,
 	},
 	/* Initio bridges, actually only needed for some older ones */ {
 		.firmware_revision	= 0x000200,