projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block
[linux-2.6-block.git]
/
drivers
/
ata
/
libata-scsi.c
diff --git
a/drivers/ata/libata-scsi.c
b/drivers/ata/libata-scsi.c
index 2bdb5dab922b734ae2daa80961ecd1fe36fab89a..e207b33e4ce9d602ca5d72144a7332c91f2515c9 100644
(file)
--- a/
drivers/ata/libata-scsi.c
+++ b/
drivers/ata/libata-scsi.c
@@
-1190,7
+1190,7
@@
static int atapi_drain_needed(struct request *rq)
if (likely(rq->cmd_type != REQ_TYPE_BLOCK_PC))
return 0;
- if (!blk_rq_bytes(rq) ||
(rq->cmd_flags & REQ_WRITE
))
+ if (!blk_rq_bytes(rq) ||
op_is_write(req_op(rq)
))
return 0;
return atapi_cmd_type(rq->cmd[0]) == ATAPI_MISC;