Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / ads7846.c

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 48cc5b060122167838d10171bf07f998ca4c8f90..0ee9ce36cad797ca7aefe85cdedaec15b8c76230 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -206,7 +206,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
        struct ads7846          *ts = dev_get_drvdata(dev);
        struct ser_req          *req = kzalloc(sizeof *req, GFP_KERNEL);
        int                     status;
-       int                     sample;
+       int                     uninitialized_var(sample);
        int                     use_internal;
 
        if (!req)