diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/advansys.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/advansys.c')
| -rw-r--r-- | drivers/scsi/advansys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index b756041f0b26..22626abdb630 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -7969,7 +7969,7 @@ static int advansys_reset(struct scsi_cmnd *scp) | |||
| 7969 | ASC_DBG(1, "before AscInitAsc1000Driver()\n"); | 7969 | ASC_DBG(1, "before AscInitAsc1000Driver()\n"); |
| 7970 | status = AscInitAsc1000Driver(asc_dvc); | 7970 | status = AscInitAsc1000Driver(asc_dvc); |
| 7971 | 7971 | ||
| 7972 | /* Refer to ASC_IERR_* defintions for meaning of 'err_code'. */ | 7972 | /* Refer to ASC_IERR_* definitions for meaning of 'err_code'. */ |
| 7973 | if (asc_dvc->err_code) { | 7973 | if (asc_dvc->err_code) { |
| 7974 | scmd_printk(KERN_INFO, scp, "SCSI bus reset error: " | 7974 | scmd_printk(KERN_INFO, scp, "SCSI bus reset error: " |
| 7975 | "0x%x\n", asc_dvc->err_code); | 7975 | "0x%x\n", asc_dvc->err_code); |