diff options
| author |   Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-24 19:41:46 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 20:56:52 +0100 |
| commit | e90874f64c89d8a3a8b287f67c5655141720c28d (patch) | |
| tree | 100efdadea0268e1cac00957a8dbb107c95ac1fa /drivers/ieee1394 | |
| parent | firewire: core: optimize propagation of BROADCAST_CHANNEL (diff) | |
| download | linux-dev-e90874f64c89d8a3a8b287f67c5655141720c28d.tar.xz linux-dev-e90874f64c89d8a3a8b287f67c5655141720c28d.zip | |
ieee1394: sbp2: follow up on "ieee1394: inherit ud vendor_id from node vendor_id"
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index f3fd8657ce4b..02255a8a1c89 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 |