summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalva Peiró <speiro@ai2.upv.es>2014-06-07 11:41:44 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:06 -0700
commit45f5ff8b66765f19fbd34b6a0ef49047c3c4a0a5 (patch)
treeaf2cd3f09566b973ae994e0af729ffe2b0a61b0a
parentdccf12f4879e9462ab1ba8bfc760d7355765504b (diff)
downloadlinux-stable-45f5ff8b66765f19fbd34b6a0ef49047c3c4a0a5.tar.gz
linux-stable-45f5ff8b66765f19fbd34b6a0ef49047c3c4a0a5.tar.bz2
linux-stable-45f5ff8b66765f19fbd34b6a0ef49047c3c4a0a5.zip
media: media-device: Remove duplicated memset() in media_enum_entities()
commit f8ca6ac00d2ba24c5557f08f81439cd3432f0802 upstream. After the zeroing the whole struct struct media_entity_desc u_ent, it is no longer necessary to memset(0) its u_ent.name field. Signed-off-by: Salva Peiró <speiro@ai2.upv.es> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/media-device.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index 703560fa5e73..88c1606fd555 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -106,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;