From ae9f915736b1510b751557031c9bc92247619853 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 6 Sep 2009 19:33:50 +0200 Subject: [PATCH] --- yaml --- r: 165319 b: refs/heads/master c: 3c5f80357c3fb3170e39e5d0ae87ddd6652f36ac h: refs/heads/master i: 165317: 1fa98b3541c7032adda48b145697d9601aa7a87b 165315: 3a4fc097353a4c53814ae832de7f429e8f756cd0 165311: 008cc6de490fbd1a0366acc9e9b5c54049fe849e v: v3 --- [refs] | 2 +- trunk/drivers/firewire/sbp2.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e3716611969..da23cf33aa1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 094614fc14966bc6a6259ade55f051fe17f36122 +refs/heads/master: 3c5f80357c3fb3170e39e5d0ae87ddd6652f36ac diff --git a/trunk/drivers/firewire/sbp2.c b/trunk/drivers/firewire/sbp2.c index 8f83bffb43e7..50f0176de615 100644 --- a/trunk/drivers/firewire/sbp2.c +++ b/trunk/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,