diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 22:45:50 -0500 |
| commit | e8b722f487589a1f60ca27adc695494f188d404e (patch) | |
| tree | be3897dceb9b7c0949a8917ab11eea2752375e3b /drivers/scsi/scsi_transport_srp.c | |
| parent | 01d07820a0df6b6134c1bb75b1e84c9d0cdab3be (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into irq/urgent
Diffstat (limited to 'drivers/scsi/scsi_transport_srp.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_srp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c index 8a7af951d98a..21a045e0559f 100644 --- a/drivers/scsi/scsi_transport_srp.c +++ b/drivers/scsi/scsi_transport_srp.c | |||
| @@ -212,7 +212,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost, | |||
| 212 | rport->roles = ids->roles; | 212 | rport->roles = ids->roles; |
| 213 | 213 | ||
| 214 | id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id); | 214 | id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id); |
| 215 | sprintf(rport->dev.bus_id, "port-%d:%d", shost->host_no, id); | 215 | dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); |
| 216 | 216 | ||
| 217 | transport_setup_device(&rport->dev); | 217 | transport_setup_device(&rport->dev); |
| 218 | 218 | ||