summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-14 13:02:09 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-14 13:02:09 +0100
commit704867ede0c3645075ff3438d1a4fd4977abaa8d (patch)
treefc89b31764132dc1b07e0af3e53219005cfb8f95 /drivers/scsi/scsi_lib.c
parentMerge branch 'regmap/irq' into regmap-next (diff)
parentMFD: DA9052/53 MFD core module add SPI support v2 (diff)
downloadlinux-704867ede0c3645075ff3438d1a4fd4977abaa8d.tar.xz
linux-704867ede0c3645075ff3438d1a4fd4977abaa8d.zip
Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 06bc26554a67..f85cfa6c47b5 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1409,6 +1409,8 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
blk_start_request(req);
+ scmd_printk(KERN_INFO, cmd, "killing request\n");
+
sdev = cmd->device;
starget = scsi_target(sdev);
shost = sdev->host;
@@ -1490,7 +1492,6 @@ static void scsi_request_fn(struct request_queue *q)
struct request *req;
if (!sdev) {
- printk("scsi: killing requests for dead queue\n");
while ((req = blk_peek_request(q)) != NULL)
scsi_kill_request(req, q);
return;