From aa98a28563d2abcd904d07fd5e54553290c85f91 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 3 Jan 2014 14:44:19 -0800 Subject: Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit() Building mei-amt-version.o triggers a GCC warning: Documentation/misc-devices/mei/mei-amt-version.c: In function 'main': Documentation/misc-devices/mei/mei-amt-version.c:103:5: warning: 'acmd.fd' is used uninitialized in this function [-Wuninitialized] if (cl->fd != -1) ^ Documentation/misc-devices/mei/mei-amt-version.c:443:21: note: 'acmd.fd' was declared here struct amt_host_if acmd; ^ GCC is correct. See, the call chain that GCC detects must be main() amt_host_if_init() mei_init() mei_deinit() But when we enter mei_deinit() struct amt_host_if acmd is still unitialized. That makes the test for (effectively) amt_host_if->mei_cl->fd bogus. But it turns out that call of mei_deinit() isn't needed at all. All of the members of mei_cl will be set later in mei_init() and none will be used before they are set. So we can simply drop this call of mei_deinit(). Signed-off-by: Paul Bolle Cc: Tomas Winkler Reported-by: David Howells Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- Documentation/misc-devices/mei/mei-amt-version.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'Documentation/misc-devices') diff --git a/Documentation/misc-devices/mei/mei-amt-version.c b/Documentation/misc-devices/mei/mei-amt-version.c index 49e4f770864a..57d0d871dcf7 100644 --- a/Documentation/misc-devices/mei/mei-amt-version.c +++ b/Documentation/misc-devices/mei/mei-amt-version.c @@ -115,8 +115,6 @@ static bool mei_init(struct mei *me, const uuid_le *guid, struct mei_client *cl; struct mei_connect_client_data data; - mei_deinit(me); - me->verbose = verbose; me->fd = open("/dev/mei", O_RDWR); -- cgit v1.2.3-55-g7522