---

yaml --- r: 219850 b: refs/heads/master c: 72bbd9b h: refs/heads/master v: v3
git-mirror · Sep 14, 2010 · 60dd386 · 60dd386
1 parent 86b4077
commit 60dd386
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ecea3c51b42419d6cd314b3d36c6ceaa9c204e9
+refs/heads/master: 72bbd9bce41276d06b6b816df21aced71b1896eb
diff --git a/trunk/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/trunk/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
@@ -95,7 +95,7 @@ static int cyasblkdev_prep_request(
 	DBGPRN_FUNC_NAME;
 
 	/* we only like normal block requests.*/
-	if (!blk_fs_request(req)) {
+	if (req->cmd_type != REQ_TYPE_FS && !(req->cmd_flags & REQ_DISCARD)) {
 		#ifndef WESTBRIDGE_NDEBUG
 		cy_as_hal_print_message("%s:%x bad request received\n",
 			__func__, current->pid) ;