scsi_transport_fc.c : .29 merge fix for FC passthru patch

James,

(Thanks James, I was looking for that macro, but missed it)

The latest merge of scsi-misc-2.6 picked up a kernel change that killed the bus_id element from struct device.

Here's a quick patch to resolve the inconsistency. I assumed this was easier than regen-ing the fc pass-thru patch.

This patch to be applied on top of the fc-pass-thru patch.

-- james s

---

 scsi_transport_fc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -upNr a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
--- a/drivers/scsi/scsi_transport_fc.c 2009-04-07 13:38:38.000000000
-0400
+++ b/drivers/scsi/scsi_transport_fc.c 2009-04-07 14:05:56.000000000
-0400
@@ -3920,7 +3920,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost,
if (!q) {
printk(KERN_ERR "%s: bsg interface failed to "
"initialize - no request queue\n",
- dev->bus_id);
+ dev_name(dev));
return -ENOMEM;
}

@@ -3933,7 +3933,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost,
if (err) {
printk(KERN_ERR "%s: bsg interface failed to "
"initialize - register queue\n",
- dev->bus_id);
+ dev_name(dev));
blk_cleanup_queue(q);
return err;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html