summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxel lin <axel.lin@gmail.com>2011-02-08 15:58:45 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 08:18:51 +0100
commit7b0e278519eba8050f2b37d7c408958745f30ecd (patch)
tree5e11d0cedfe89dc9fd8c2cdb7a7dd1ade5e6a385
parentradeonfb: Let hwmon driver probe the "monid" I2C bus (diff)
downloadlinux-7b0e278519eba8050f2b37d7c408958745f30ecd.tar.xz
linux-7b0e278519eba8050f2b37d7c408958745f30ecd.zip
video: ffb: fix ffb_probe error path
Current implementation calls of_iounmap for par->fbc twice in error path. In the case of goto out_unmap_dac, we should call of_iounmap for par->dac. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/ffb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 910c5e6f6702..14102a3f70f5 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -1010,7 +1010,7 @@ out_dealloc_cmap:
fb_dealloc_cmap(&info->cmap);
out_unmap_dac:
- of_iounmap(&op->resource[2], par->fbc, sizeof(struct ffb_fbc));
+ of_iounmap(&op->resource[1], par->dac, sizeof(struct ffb_dac));
out_unmap_fbc:
of_iounmap(&op->resource[2], par->fbc, sizeof(struct ffb_fbc));