---

yaml --- r: 136033 b: refs/heads/master c: e90874f h: refs/heads/master i: 136031: a83b560 v: v3
git-mirror · Mar 24, 2009 · b07ce6b · b07ce6b
1 parent 0baa18c
commit b07ce6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7889b60ee71eafaf50699a154a2455424bb92daa
+refs/heads/master: e90874f64c89d8a3a8b287f67c5655141720c28d
diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c
@@ -1413,8 +1413,7 @@ static void sbp2_parse_unit_directory(struct sbp2_lu *lu,
 			  "(firmware_revision 0x%06x, vendor_id 0x%06x,"
 			  " model_id 0x%06x)",
 			  NODE_BUS_ARGS(ud->ne->host, ud->ne->nodeid),
-			  workarounds, firmware_revision,
-			  ud->vendor_id ? ud->vendor_id : ud->ne->vendor_id,
+			  workarounds, firmware_revision, ud->vendor_id,
 			  model);
 
 	/* We would need one SCSI host template for each target to adjust