git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[Bluetooth] Restrict well known PSM to privileged users
[pandora-kernel.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index
62c7a30
..
536be74
100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-82,7
+82,7
@@
inline int elv_rq_merge_ok(struct request *rq, struct bio *bio)
/*
* must be same device and not a special request
*/
- if (rq->rq_disk != bio->bi_bdev->bd_disk ||
!
rq->special)
+ if (rq->rq_disk != bio->bi_bdev->bd_disk || rq->special)
return 0;
if (!elv_iosched_allow_merge(rq, bio))