diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 19:16:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 19:16:42 -0800 |
commit | c8c6c9ba39e3fe65cf3497d692bf6fe808ff222b (patch) | |
tree | 4358c44f57f9ce1bfb5886aea8bea3b137ecb551 /drivers/scsi/am53c974.c | |
parent | Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs (diff) | |
parent | sg: fix EWOULDBLOCK errors with scsi-mq (diff) | |
download | linux-dev-c8c6c9ba39e3fe65cf3497d692bf6fe808ff222b.tar.xz linux-dev-c8c6c9ba39e3fe65cf3497d692bf6fe808ff222b.zip |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull misc SCSI patches from James Bottomley:
"This is a short patch set representing a couple of left overs from the
merge window (debug removal and MAINTAINER changes).
Plus one merge window regression (the local workqueue for hpsa) and a
set of bug fixes for several issues (two for scsi-mq and the rest an
assortment of long standing stuff, all cc'd to stable)"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
sg: fix EWOULDBLOCK errors with scsi-mq
sg: fix unkillable I/O wait deadlock with scsi-mq
sg: fix read() error reporting
wd719x: add missing .module to wd719x_template
hpsa: correct compiler warnings introduced by hpsa-add-local-workqueue patch
fixed invalid assignment of 64bit mask to host dma_boundary for scatter gather segment boundary limit.
fcoe: Transition maintainership to Vasu
am53c974: remove left-over debugging code
Diffstat (limited to 'drivers/scsi/am53c974.c')
-rw-r--r-- | drivers/scsi/am53c974.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/am53c974.c b/drivers/scsi/am53c974.c index aa3e2c7cd83c..a6f5ee80fadc 100644 --- a/drivers/scsi/am53c974.c +++ b/drivers/scsi/am53c974.c @@ -178,12 +178,6 @@ static void pci_esp_dma_drain(struct esp *esp) break; cpu_relax(); } - if (resid > 1) { - /* FIFO not cleared */ - shost_printk(KERN_INFO, esp->host, - "FIFO not cleared, %d bytes left\n", - resid); - } /* * When there is a residual BCMPLT will never be set |