diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/hosts.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
Merge by Hand
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 71dd1ebbe58f..5b9c2c5a7f0e 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
| @@ -140,11 +140,11 @@ int scsi_host_set_state(struct Scsi_Host *shost, enum scsi_host_state state) | |||
| 140 | 140 | ||
| 141 | illegal: | 141 | illegal: |
| 142 | SCSI_LOG_ERROR_RECOVERY(1, | 142 | SCSI_LOG_ERROR_RECOVERY(1, |
| 143 | dev_printk(KERN_ERR, &shost->shost_gendev, | 143 | shost_printk(KERN_ERR, shost, |
| 144 | "Illegal host state transition" | 144 | "Illegal host state transition" |
| 145 | "%s->%s\n", | 145 | "%s->%s\n", |
| 146 | scsi_host_state_name(oldstate), | 146 | scsi_host_state_name(oldstate), |
| 147 | scsi_host_state_name(state))); | 147 | scsi_host_state_name(state))); |
| 148 | return -EINVAL; | 148 | return -EINVAL; |
| 149 | } | 149 | } |
| 150 | EXPORT_SYMBOL(scsi_host_set_state); | 150 | EXPORT_SYMBOL(scsi_host_set_state); |