Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ede40f8 authored by Jean Delvare's avatar Jean Delvare Committed by Linus Torvalds
Browse files

matrox maven: fix a broken error path 



I broke an error path with d03c21ec,
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: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarKrzysztof 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d6bf73e4

drivers/video/matrox/matroxfb_maven.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}