diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:25:34 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:25:34 +0400 |
commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /drivers/video/omap2/displays/panel-taal.c | |
parent | f2c32a882d2c1cde6fc552a5a3d34b4c1330edb8 (diff) | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
download | linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.tar.xz |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/omap2/displays/panel-taal.c')
-rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 2ce9992f403b..901576eb5a84 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -526,7 +526,7 @@ static ssize_t taal_num_errors_show(struct device *dev, { struct omap_dss_device *dssdev = to_dss_device(dev); struct taal_data *td = dev_get_drvdata(&dssdev->dev); - u8 errors; + u8 errors = 0; int r; mutex_lock(&td->lock); |