summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-10 06:39:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-10 06:39:11 -0700
commit1acb54a652e91435862e149aadebe62f32945fba (patch)
tree2828e5ef7271dd3f3491fea946722c0044d86ae5
parentd2286074f3625471716ac7170e868e78b4c64664 (diff)
parent6cced823ba428dbf6913d6d5a5369c54b0fcbc8d (diff)
Merge "video: adf: zero out mapping data on adf_buffer_map() failure"
-rw-r--r--drivers/video/adf/adf_client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/adf/adf_client.c b/drivers/video/adf/adf_client.c
index 8061d8e6b9fb..75b2f0b18522 100644
--- a/drivers/video/adf/adf_client.c
+++ b/drivers/video/adf/adf_client.c
@@ -305,8 +305,10 @@ static int adf_buffer_map(struct adf_device *dev, struct adf_buffer *buf,
}
done:
- if (ret < 0)
+ if (ret < 0) {
adf_buffer_mapping_cleanup(mapping, buf);
+ memset(mapping, 0, sizeof(*mapping));
+ }
return ret;
}