From: Michael Hennerich <[email protected]>
If the sub-probe functions fail, we need to pass up the error code to the
higher levels from the probe function. We currently always return 0 even
if there was an error so higher levels don't report problems.
Signed-off-by: Michael Hennerich <[email protected]>
Signed-off-by: Mike Frysinger <[email protected]>
---
drivers/input/touchscreen/ad7879.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index f06332c..c21e6d3 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -645,7 +645,7 @@ static int __devinit ad7879_probe(struct spi_device *spi)
kfree(ts);
}
- return 0;
+ return error;
}
static int __devexit ad7879_remove(struct spi_device *spi)
@@ -732,7 +732,7 @@ static int __devinit ad7879_probe(struct i2c_client *client,
kfree(ts);
}
- return 0;
+ return error;
}
static int __devexit ad7879_remove(struct i2c_client *client)
--
1.6.5.rc2
On Sun, Oct 04, 2009 at 01:22:05AM -0400, Mike Frysinger wrote:
> From: Michael Hennerich <[email protected]>
>
> If the sub-probe functions fail, we need to pass up the error code to the
> higher levels from the probe function. We currently always return 0 even
> if there was an error so higher levels don't report problems.
>
> Signed-off-by: Michael Hennerich <[email protected]>
> Signed-off-by: Mike Frysinger <[email protected]>
Applied, thannk you Michael.
--
Dmitry