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 <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c
index 8dc29bd..5cc469a 100644 (file)
--- 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) ;