diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:18:13 -0700 |
| commit | 0111d0f13469831266d716e3b50d580a3e25cff9 (patch) | |
| tree | e2c082e97808f1303190fae3bb79cb8bf359bf2c /drivers/media/media-device.c | |
| parent | 29a6185d2f78e35b0b36d0ed94bc27d2b71e1ef3 (diff) | |
| parent | af92ba8fd23cb5811d96b833bbb7133efefeb5b9 (diff) | |
Merge tag 'v3.14.19' into linux-linaro-lsk-v3.14lsk-v3.14-14.09
This is the 3.14.19 stable release
Diffstat (limited to 'drivers/media/media-device.c')
| -rw-r--r-- | drivers/media/media-device.c | 2 |
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; |