2 files changed, 4 insertions, 0 deletions

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 6915db2d36db..369eddd352c3 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -1158,10 +1158,13 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                 }
         } else {
                 ctrls = get_ctrl(gspca_dev, id);
+                i = ctrls - gspca_dev->sd_desc->ctrls;
         }
         if (ctrls == NULL)
                 return -EINVAL;
         memcpy(q_ctrl, ctrls, sizeof *q_ctrl);
+        if (gspca_dev->ctrl_inac & (1 << i))
+                q_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;
         return 0;
 }
 
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h
index 1d761d7cefc6..d59a684056ca 100644
--- a/drivers/media/video/gspca/gspca.h
+++ b/drivers/media/video/gspca/gspca.h
@@ -143,6 +143,7 @@ struct gspca_dev {
         struct cam cam;                         /* device information */
         const struct sd_desc *sd_desc;          /* subdriver description */
         unsigned ctrl_dis;              /* disabled controls (bit map) */
+        unsigned ctrl_inac;             /* inactive controls (bit map) */
 
 #define USB_BUF_SZ 64
         __u8 *usb_buf;                          /* buffer for USB exchanges */