matrox maven: fix a broken error path
I broke an error path with d03c21ec0b
,
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>
This commit is contained in:
Родитель
d6bf73e434
Коммит
5ede40f879
|
@ -1266,7 +1266,7 @@ static int maven_detect_client(struct i2c_adapter* adapter, int address, int kin
|
||||||
ERROR4:;
|
ERROR4:;
|
||||||
i2c_detach_client(new_client);
|
i2c_detach_client(new_client);
|
||||||
ERROR3:;
|
ERROR3:;
|
||||||
kfree(new_client);
|
kfree(data);
|
||||||
ERROR0:;
|
ERROR0:;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче