aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb-hid.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-usb-hid.c')
-rw-r--r--epan/dissectors/packet-usb-hid.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-usb-hid.c b/epan/dissectors/packet-usb-hid.c
index 3a9bef7321..f30bb0fff3 100644
--- a/epan/dissectors/packet-usb-hid.c
+++ b/epan/dissectors/packet-usb-hid.c
@@ -766,20 +766,17 @@ static const value_string usb_hid_report_type_vals[] = {
* and FALSE otherwise.
*/
static gint
-dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_usb_hid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
gboolean is_request;
- usb_conv_info_t *usb_conv_info;
- usb_trans_info_t *usb_trans_info;
+ usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data;
+ usb_trans_info_t *usb_trans_info = usb_conv_info->usb_trans_info;
int offset = 0;
usb_setup_dissector dissector;
const usb_setup_dissector_table_t *tmp;
is_request = (pinfo->srcport==NO_ENDPOINT);
- usb_conv_info = (usb_conv_info_t *)pinfo->usb_conv_info;
- usb_trans_info = usb_conv_info->usb_trans_info;
-
/* See if we can find a class specific dissector for this request */
dissector = NULL;