Documentation/misc-devices/mei/mei-amt-version.c: remove unneeded call of mei_deinit()
authorPaul Bolle <pebolle@tiscali.nl>
Fri, 3 Jan 2014 22:44:19 +0000 (14:44 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jan 2014 23:20:20 +0000 (15:20 -0800)
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 <pebolle@tiscali.nl>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Reported-by: David Howells <dhowells@redhat.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/misc-devices/mei/mei-amt-version.c

index 49e4f770864a5f1ee2211e75378719f39e91eafd..57d0d871dcf7143563f80469ad8f9d6b74fea40a 100644 (file)
@@ -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);