1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index af26bbe6f76e..f7061a5ef1d2 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -2083,7 +2083,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
         /* Walk the entities list and instantiate controls */
         list_for_each_entry(entity, &dev->entities, list) {
                 struct uvc_control *ctrl;
-                unsigned int bControlSize = 0, ncontrols = 0;
+                unsigned int bControlSize = 0, ncontrols;
                 __u8 *bmControls = NULL;
 
                 if (UVC_ENTITY_TYPE(entity) == UVC_VC_EXTENSION_UNIT) {
@@ -2101,8 +2101,7 @@ int uvc_ctrl_init_device(struct uvc_device *dev)
                 uvc_ctrl_prune_entity(dev, entity);
 
                 /* Count supported controls and allocate the controls array */
-                for (i = 0; i < bControlSize; ++i)
-                        ncontrols += hweight8(bmControls[i]);
+                ncontrols = memweight(bmControls, bControlSize);
                 if (ncontrols == 0)
                         continue;