aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pvrusb2')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h4
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 8c2d222960f1..894c630c95c0 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -174,8 +174,8 @@ struct pvr2_hdw {
174 struct usb_device *usb_dev; 174 struct usb_device *usb_dev;
175 struct usb_interface *usb_intf; 175 struct usb_interface *usb_intf;
176 176
177 /* Device type, one of PVR2_HDW_TYPE_xxxxx */ 177 /* Device description, anything that must adjust behavior based on
178 unsigned int hdw_type; 178 device specific info will use information held here. */
179 const struct pvr2_device_desc *hdw_desc; 179 const struct pvr2_device_desc *hdw_desc;
180 180
181 /* Kernel worker thread handling */ 181 /* Kernel worker thread handling */
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index c56208456bc0..c08162cc20ae 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1831,7 +1831,6 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
1831 hdw->controls = kzalloc(sizeof(struct pvr2_ctrl) * hdw->control_cnt, 1831 hdw->controls = kzalloc(sizeof(struct pvr2_ctrl) * hdw->control_cnt,
1832 GFP_KERNEL); 1832 GFP_KERNEL);
1833 if (!hdw->controls) goto fail; 1833 if (!hdw->controls) goto fail;
1834 hdw->hdw_type = hdw_type;
1835 hdw->hdw_desc = hdw_desc; 1834 hdw->hdw_desc = hdw_desc;
1836 for (idx = 0; idx < hdw->control_cnt; idx++) { 1835 for (idx = 0; idx < hdw->control_cnt; idx++) {
1837 cptr = hdw->controls + idx; 1836 cptr = hdw->controls + idx;