diff options
| author | David Cross <david.cross@cypress.com> | 2010-09-10 16:52:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-14 16:52:46 -0700 |
| commit | 72bbd9bce41276d06b6b816df21aced71b1896eb (patch) | |
| tree | ecc306d2851afe48dcaa602a73cdd7c0b1a0ce3c | |
| parent | 4ecea3c51b42419d6cd314b3d36c6ceaa9c204e9 (diff) | |
| download | op-kernel-dev-72bbd9bce41276d06b6b816df21aced71b1896eb.zip op-kernel-dev-72bbd9bce41276d06b6b816df21aced71b1896eb.tar.gz | |
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>
| -rw-r--r-- | drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_queue.c index 8dc29bd..5cc469a 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) ; |
