diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
| commit | f61ea1b0c825a20a1826bb43a226387091934586 (patch) | |
| tree | fdedf0a2368f707e3fd5205db05bfcbac79606ec /drivers/scsi/qla2xxx/qla_attr.c | |
| parent | d347da0deffa1d8f88f0d270eab040e4707c9916 (diff) | |
| parent | 7b32b8e018d8f8cc94c808a5fa84a3f889441b91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_attr.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 48e460eef05a..2efca52dff50 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -232,7 +232,7 @@ static ssize_t | |||
| 232 | qla2x00_isp_name_show(struct class_device *cdev, char *buf) | 232 | qla2x00_isp_name_show(struct class_device *cdev, char *buf) |
| 233 | { | 233 | { |
| 234 | scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev)); | 234 | scsi_qla_host_t *ha = to_qla_host(class_to_shost(cdev)); |
| 235 | return snprintf(buf, PAGE_SIZE, "%s\n", ha->brd_info->isp_name); | 235 | return snprintf(buf, PAGE_SIZE, "ISP%04X\n", ha->pdev->device); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | static ssize_t | 238 | static ssize_t |