diff options
author | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /drivers/char/agp/frontend.c | |
parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'drivers/char/agp/frontend.c')
-rw-r--r-- | drivers/char/agp/frontend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c index 8121b4c70ede..b29703324e94 100644 --- a/drivers/char/agp/frontend.c +++ b/drivers/char/agp/frontend.c @@ -730,6 +730,7 @@ static int agpioc_info_wrap(struct agp_file_private *priv, void __user *arg) agp_copy_info(agp_bridge, &kerninfo); + memset(&userinfo, 0, sizeof(userinfo)); userinfo.version.major = kerninfo.version.major; userinfo.version.minor = kerninfo.version.minor; userinfo.bridge_id = kerninfo.device->vendor | |