]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id"
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 24 Jan 2009 18:41:46 +0000 (19:41 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Tue, 24 Mar 2009 19:56:52 +0000 (20:56 +0100)
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/ieee1394/sbp2.c

index f3fd8657ce4b62c6d12180c779c7e2bac6996f60..02255a8a1c89f5ab694136ee389fbf5cbce28c51 100644 (file)
@@ -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