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/megaraid | |
| 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/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index c3f637395734..4245d05e628b 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -758,9 +758,8 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd) | |||
| 758 | 758 | ||
| 759 | instance = (struct megasas_instance *)scmd->device->host->hostdata; | 759 | instance = (struct megasas_instance *)scmd->device->host->hostdata; |
| 760 | 760 | ||
| 761 | printk(KERN_NOTICE "megasas: RESET -%ld cmd=%x <c=%d t=%d l=%d>\n", | 761 | scmd_printk(KERN_NOTICE, scmd, "megasas: RESET -%ld cmd=%x\n", |
| 762 | scmd->serial_number, scmd->cmnd[0], scmd->device->channel, | 762 | scmd->serial_number, scmd->cmnd[0]); |
| 763 | scmd->device->id, scmd->device->lun); | ||
| 764 | 763 | ||
| 765 | if (instance->hw_crit_error) { | 764 | if (instance->hw_crit_error) { |
| 766 | printk(KERN_ERR "megasas: cannot recover from previous reset " | 765 | printk(KERN_ERR "megasas: cannot recover from previous reset " |