aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-08-12 15:08:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:07:29 -0700
commit5ede40f87957c6ededf9284c8339722a97b9dfb6 (patch)
tree7bfadd8db09bda249aa06c387315267e34ee17f7
parentd6bf73e4340f52159c1d9f13836b62e20fcd12d3 (diff)
downloadlinux-stericsson-5ede40f87957c6ededf9284c8339722a97b9dfb6.tar.gz
matrox maven: fix a broken error path
I broke an error path with d03c21ec0be7787ff6b75dcf56c0e96209ccbfbd, sorry about that. The machine will crash if the i2c_attach_client() or maven_init_client() calls fail, although nobody has yet reported this happening. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz> Cc: <stable@kernel.org> [2.6.25.x, 2.6.26.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/matrox/matroxfb_maven.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 89da27bd5c49..2ad06b0125c3 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1266,7 +1266,7 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
ERROR4:;
i2c_detach_client(new_client);
ERROR3:;
- kfree(new_client);
+ kfree(data);
ERROR0:;
return err;
}