Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / media-device.c

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 1957c0df08fdb5717acedbf17162774f8c75dd05..fdb5840f034ba7915c610e4c8a3bf9d6ccebf914 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -93,6 +93,7 @@ static long media_device_enum_entities(struct media_device *mdev,
        struct media_entity *ent;
        struct media_entity_desc u_ent;
 
+       memset(&u_ent, 0, sizeof(u_ent));
        if (copy_from_user(&u_ent.id, &uent->id, sizeof(u_ent.id)))
                return -EFAULT;
 
@@ -105,8 +106,6 @@ static long media_device_enum_entities(struct media_device *mdev,
        if (ent->name) {
                strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
                u_ent.name[sizeof(u_ent.name) - 1] = '\0';
-       } else {
-               memset(u_ent.name, 0, sizeof(u_ent.name));
        }
        u_ent.type = ent->type;
        u_ent.revision = ent->revision;