diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-16 11:01:38 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-16 12:15:21 +0000 |
| commit | 0921fddc49b77e6855fe4ea5b96bd7bbae468a6d (patch) | |
| tree | 1ce7ee0b7cb75eb034fa7cafae9189c171c0c559 /epan/dissectors/packet-usb-com.c | |
| parent | 36079a1eb55768755e4861801e3b651ebf603a52 (diff) | |
USB COM: revert ga618f1c change now that g5e8c629 is merged
Change-Id: I8a71173b88368f791e9476c2b059d36c57a3b935
Reviewed-on: https://code.wireshark.org/review/11088
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb-com.c')
| -rw-r--r-- | epan/dissectors/packet-usb-com.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-usb-com.c b/epan/dissectors/packet-usb-com.c index 73addf655b..33d8cd5584 100644 --- a/epan/dissectors/packet-usb-com.c +++ b/epan/dissectors/packet-usb-com.c @@ -554,11 +554,11 @@ dissect_usb_com_ntb_input_size(tvbuff_t *tvb, proto_tree *tree, gint base_offset } static int -dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *setup_tree, void *data) +dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { usb_conv_info_t *usb_conv_info = (usb_conv_info_t *)data; usb_trans_info_t *usb_trans_info; - proto_tree *tree, *subtree; + proto_tree *subtree; proto_item *ti; gint offset = 0; gboolean is_request; @@ -569,7 +569,6 @@ dissect_usb_com_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *setup_tre col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBCOM"); - tree = proto_tree_get_parent_tree(setup_tree); ti = proto_tree_add_item(tree, proto_usb_com, tvb, 0, -1, ENC_NA); subtree = proto_item_add_subtree(ti, ett_usb_com); |