diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 10:31:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 10:31:35 -0800 |
| commit | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (patch) | |
| tree | 32fbc17daf7879a9a86eb029096994be45cd136b /drivers/scsi/3w-xxxx.c | |
| parent | a2c78f7c1d393d89240ed5922d3aa8e439aec82e (diff) | |
| parent | 39b7f1e25a412b0ef31e516cfc2fa4f40235f263 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/3w-xxxx.c')
| -rw-r--r-- | drivers/scsi/3w-xxxx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index ae9e0203e9d..283f6d25892 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -1432,7 +1432,9 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt) tw_dev->num_resets++; - printk(KERN_WARNING "3w-xxxx: scsi%d: WARNING: Unit #%d: Command (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, SCpnt->device->id, SCpnt->cmnd[0]); + sdev_printk(KERN_WARNING, SCpnt->device, + "WARNING: Command (0x%x) timed out, resetting card.\n", + SCpnt->cmnd[0]); /* Now reset the card and some of the device extension data */ if (tw_reset_device_extension(tw_dev, 0)) { |