diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-24 13:41:46 -0500 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:52 -0400 |
| commit | e90874f64c89d8a3a8b287f67c5655141720c28d (patch) | |
| tree | 100efdadea0268e1cac00957a8dbb107c95ac1fa /drivers/ieee1394 | |
| parent | 7889b60ee71eafaf50699a154a2455424bb92daa (diff) | |
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, | |||
| 1413 | "(firmware_revision 0x%06x, vendor_id 0x%06x," | 1413 | "(firmware_revision 0x%06x, vendor_id 0x%06x," |
| 1414 | " model_id 0x%06x)", | 1414 | " model_id 0x%06x)", |
| 1415 | NODE_BUS_ARGS(ud->ne->host, ud->ne->nodeid), | 1415 | NODE_BUS_ARGS(ud->ne->host, ud->ne->nodeid), |
| 1416 | workarounds, firmware_revision, | 1416 | workarounds, firmware_revision, ud->vendor_id, |
| 1417 | ud->vendor_id ? ud->vendor_id : ud->ne->vendor_id, | ||
| 1418 | model); | 1417 | model); |
| 1419 | 1418 | ||
| 1420 | /* We would need one SCSI host template for each target to adjust | 1419 | /* We would need one SCSI host template for each target to adjust |