diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/scsi/scsi_lib.c | |
parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index b8de389636f8..9ade720422c6 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -1370,12 +1370,6 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) | |||
1370 | 1370 | ||
1371 | blk_start_request(req); | 1371 | blk_start_request(req); |
1372 | 1372 | ||
1373 | if (unlikely(cmd == NULL)) { | ||
1374 | printk(KERN_CRIT "impossible request in %s.\n", | ||
1375 | __func__); | ||
1376 | BUG(); | ||
1377 | } | ||
1378 | |||
1379 | sdev = cmd->device; | 1373 | sdev = cmd->device; |
1380 | starget = scsi_target(sdev); | 1374 | starget = scsi_target(sdev); |
1381 | shost = sdev->host; | 1375 | shost = sdev->host; |