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 tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[linux-2.6-block.git]
/
drivers
/
ide
/
ide-atapi.c
diff --git
a/drivers/ide/ide-atapi.c
b/drivers/ide/ide-atapi.c
index 2162bc80f09e02ff2daa35362436de1dbb802217..013ad33fbbc81ee507148df1aeffde66613957d2 100644
(file)
--- a/
drivers/ide/ide-atapi.c
+++ b/
drivers/ide/ide-atapi.c
@@
-223,7
+223,6
@@
void ide_prep_sense(ide_drive_t *drive, struct request *rq)
sense_rq->rq_disk = rq->rq_disk;
sense_rq->cmd_flags = REQ_OP_DRV_IN;
ide_req(sense_rq)->type = ATA_PRIV_SENSE;
- sense_rq->rq_flags |= RQF_PREEMPT;
req->cmd[0] = GPCMD_REQUEST_SENSE;
req->cmd[4] = cmd_len;