From 60dd386ddf0b9862727c0f0937cf8e6cb73970c9 Mon Sep 17 00:00:00 2001 From: David Cross Date: Fri, 10 Sep 2010 16:52:56 -0700 Subject: [PATCH] --- yaml --- r: 219850 b: refs/heads/master c: 72bbd9bce41276d06b6b816df21aced71b1896eb h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6770450573eb..a4d3306a73b8 100644 --- 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 index 8dc29bd2891d..5cc469ab89fe 100644 --- 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) ;