Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / hid / uhid.c

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index ea560bfa033d2a101db20102f104e01368a16eef..714cd8cc9579b6cd3c71b8a2aebb140e089f27e6 100644 (file)
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -154,7 +154,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
        struct uhid_event *ev;
        unsigned long flags;
        int ret;
-       size_t len;
+       size_t uninitialized_var(len);
        struct uhid_feature_answer_req *req;
 
        if (!uhid->running)
@@ -465,7 +465,7 @@ try_again:
                goto try_again;
        } else {
                len = min(count, sizeof(**uhid->outq));
-               if (copy_to_user(buffer, &uhid->outq[uhid->tail], len)) {
+               if (copy_to_user(buffer, uhid->outq[uhid->tail], len)) {
                        ret = -EFAULT;
                } else {
                        kfree(uhid->outq[uhid->tail]);