From: David Cross Date: Fri, 10 Sep 2010 23:52:56 +0000 (-0700) Subject: Staging: west bridge: block driver api fix X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=72bbd9bce41276d06b6b816df21aced71b1896eb;p=deliverable%2Flinux.git Staging: west bridge: block driver api fix This patch contains an update for cyasblkdev_queue.c which is needed for the kernel update from 2.6.35 to 2.6.36. Signed-off-by: David Cross Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c index 8dc29bd2891d..5cc469ab89fe 100644 --- a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c +++ b/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) ;