From b07ce6b601fd5e144079388f866e4539ecb385f5 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 24 Jan 2009 19:41:46 +0100 Subject: [PATCH] --- yaml --- r: 136033 b: refs/heads/master c: e90874f64c89d8a3a8b287f67c5655141720c28d h: refs/heads/master i: 136031: a83b5607c5af65b98616c2b35608802189e97c4e v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/sbp2.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae128efb9fa4..49b84c331595 100644 --- 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 index f3fd8657ce4b..02255a8a1c89 100644 --- 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