Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / input / misc / adxl34x.c

diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
index 0924480..89b2f5b 100644 (file)
--- a/drivers/input/misc/adxl34x.c
+++ b/drivers/input/misc/adxl34x.c
@@ -797,7 +797,7 @@ struct adxl34x *adxl34x_probe(struct device *dev, int irq,
 
        if (pdata->watermark) {
                ac->int_mask |= WATERMARK;
-               if (!FIFO_MODE(pdata->fifo_mode))
+               if (FIFO_MODE(pdata->fifo_mode) == FIFO_BYPASS)
                        ac->pdata.fifo_mode |= FIFO_STREAM;
        } else {
                ac->int_mask |= DATA_READY;