---

yaml --- r: 77637 b: refs/heads/master c: 482eb68 h: refs/heads/master i: 77635: 996ac0a v: v3
git-mirror · Jan 28, 2008 · b75c918 · b75c918
1 parent 117b686
commit b75c918
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6da127ad0918f93ea93678dad62ce15ffed18797
+refs/heads/master: 482eb689169948e9f4966fbae6be4d6bc0bfa818
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
@@ -836,12 +836,7 @@ static inline int bdev_hardsect_size(struct block_device *bdev)
 
 static inline int queue_dma_alignment(struct request_queue *q)
 {
-	int retval = 511;
-
-	if (q && q->dma_alignment)
-		retval = q->dma_alignment;
-
-	return retval;
+	return q ? q->dma_alignment : 511;
 }
 
 /* assumes size > 256 */