summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaeed Bishara <saeed@marvell.com>2010-12-21 16:53:39 +0200
committerWilly Tarreau <w@1wt.eu>2011-02-09 22:15:36 +0100
commit685c0cc45ed6d9a6289dee976eb6b9db4f05c5fe (patch)
tree4fabe5c65055e259b6ffa36a56d998a7789abfb2
parentfca909254747217cbd454e9913fedfc728704828 (diff)
mv_xor: fix race in tasklet function
commit 8333f65ef094e47020cd01452b4637e7daf5a77f upstream. use mv_xor_slot_cleanup() instead of __mv_xor_slot_cleanup() as the former function aquires the spin lock that needed to protect the drivers data. Signed-off-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/dma/mv_xor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 369612e59b15..13136bc2a896 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -449,7 +449,7 @@ mv_xor_slot_cleanup(struct mv_xor_chan *mv_chan)
static void mv_xor_tasklet(unsigned long data)
{
struct mv_xor_chan *chan = (struct mv_xor_chan *) data;
- __mv_xor_slot_cleanup(chan);
+ mv_xor_slot_cleanup(chan);
}
static struct mv_xor_desc_slot *