Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / drivers / media / media-device.c

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index e79f72b8b858077f7b646caf7606afb42a830411..35e81f7c0d2f1d6b3dbd6f1579538e2283336509 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -190,6 +190,7 @@ static long media_device_enum_links(struct media_device *mdev,
                        ulink_desc++;
                }
        }
+       memset(links->reserved, 0, sizeof(links->reserved));
 
        return 0;
 }
@@ -218,6 +219,8 @@ static long media_device_setup_link(struct media_device *mdev,
        if (link == NULL)
                return -EINVAL;
 
+       memset(linkd->reserved, 0, sizeof(linkd->reserved));
+
        /* Setup the link on both entities. */
        return __media_entity_setup_link(link, linkd->flags);
 }
@@ -255,7 +258,7 @@ static long media_device_get_topology(struct media_device *mdev,
                memset(&kentity, 0, sizeof(kentity));
                kentity.id = entity->graph_obj.id;
                kentity.function = entity->function;
-               strncpy(kentity.name, entity->name,
+               strlcpy(kentity.name, entity->name,
                        sizeof(kentity.name));
 
                if (copy_to_user(uentity, &kentity, sizeof(kentity)))
@@ -263,6 +266,7 @@ static long media_device_get_topology(struct media_device *mdev,
                uentity++;
        }
        topo->num_entities = i;
+       topo->reserved1 = 0;
 
        /* Get interfaces and number of interfaces */
        i = 0;
@@ -298,6 +302,7 @@ static long media_device_get_topology(struct media_device *mdev,
                uintf++;
        }
        topo->num_interfaces = i;
+       topo->reserved2 = 0;
 
        /* Get pads and number of pads */
        i = 0;
@@ -324,6 +329,7 @@ static long media_device_get_topology(struct media_device *mdev,
                upad++;
        }
        topo->num_pads = i;
+       topo->reserved3 = 0;
 
        /* Get links and number of links */
        i = 0;
@@ -355,6 +361,7 @@ static long media_device_get_topology(struct media_device *mdev,
                ulink++;
        }
        topo->num_links = i;
+       topo->reserved4 = 0;
 
        return ret;
 }