iommu/amd: Fix unity mapping initialization race

[linux-2.6-block.git] / drivers / firewire / core-transaction.c

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index eb6935c8ad9449bb1c557ac8c596940fc2919096..d6a09b9cd8ccae2c35cee866ac35b1d4ba066975 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -1246,14 +1246,14 @@ static const u32 model_textual_descriptor[] = {
 
 static struct fw_descriptor vendor_id_descriptor = {
        .length = ARRAY_SIZE(vendor_textual_descriptor),
-       .immediate = 0x03d00d1e,
+       .immediate = 0x03001f11,
        .key = 0x81000000,
        .data = vendor_textual_descriptor,
 };
 
 static struct fw_descriptor model_id_descriptor = {
        .length = ARRAY_SIZE(model_textual_descriptor),
-       .immediate = 0x17000001,
+       .immediate = 0x17023901,
        .key = 0x81000000,
        .data = model_textual_descriptor,
 };