From: Salva Peiró Date: Sat, 7 Jun 2014 14:41:44 +0000 (-0300) Subject: [media] media-device: Remove duplicated memset() in media_enum_entities() X-Git-Tag: v3.17-rc1~112^2~195 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8ca6ac00d2ba24c5557f08f81439cd3432f0802;p=karo-tx-linux.git [media] media-device: Remove duplicated memset() in media_enum_entities() 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. CC: stable@vger.kernel.org Signed-off-by: Salva Peiró Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 88b97c9e64ac..73a432934bd8 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;