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/ide-scsi.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/ide-scsi.c')
| -rw-r--r-- | drivers/scsi/ide-scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index a440ea38efaa..f04f3289938d 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
| @@ -899,7 +899,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd, | |||
| 899 | idescsi_pc_t *pc = NULL; | 899 | idescsi_pc_t *pc = NULL; |
| 900 | 900 | ||
| 901 | if (!drive) { | 901 | if (!drive) { |
| 902 | printk (KERN_ERR "ide-scsi: drive id %d not present\n", cmd->device->id); | 902 | scmd_printk (KERN_ERR, cmd, "drive not present\n"); |
| 903 | goto abort; | 903 | goto abort; |
| 904 | } | 904 | } |
| 905 | scsi = drive_to_idescsi(drive); | 905 | scsi = drive_to_idescsi(drive); |