media: go7007: fix two sparse warnings
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 14 May 2018 12:37:17 +0000 (08:37 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 25 May 2018 19:30:04 +0000 (15:30 -0400)
drivers/media/usb/go7007/go7007-v4l2.c:637:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]
drivers/media/usb/go7007/go7007-fw.c:1507:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/go7007/go7007-fw.c
drivers/media/usb/go7007/go7007-v4l2.c

index 60bf5f0..87b4fc4 100644 (file)
@@ -1514,7 +1514,10 @@ static int do_special(struct go7007 *go, u16 type, __le16 *code, int space,
                case V4L2_PIX_FMT_MPEG4:
                        return gen_mpeg4hdr_to_package(go, code, space,
                                                                framelen);
+               default:
+                       break;
                }
+               break;
        case SPECIAL_BRC_CTRL:
                return brctrl_to_package(go, code, space, framelen);
        case SPECIAL_CONFIG:
index 98cd57e..c55c82f 100644 (file)
@@ -634,7 +634,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
        if (inp->index >= go->board_info->num_inputs)
                return -EINVAL;
 
-       strncpy(inp->name, go->board_info->inputs[inp->index].name,
+       strlcpy(inp->name, go->board_info->inputs[inp->index].name,
                        sizeof(inp->name));
 
        /* If this board has a tuner, it will be the first input */