From: Stefan Richter Date: Sat, 24 Jan 2009 18:41:46 +0000 (+0100) Subject: ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id" X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e90874f64c89d8a3a8b287f67c5655141720c28d;p=linux-2.6-omap-h63xx.git ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id" Signed-off-by: Stefan Richter --- diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index f3fd8657ce4..02255a8a1c8 100644 --- a/drivers/ieee1394/sbp2.c +++ b/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