Merge "USB: ccid_bridge: Increase the bulk message timeout"

/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

#define CCID_BRIDGE_MSG_SZ 512

#define CCID_BRIDGE_OPEN_TIMEOUT 500 /* msec */

#define CCID_CONTROL_TIMEOUT 500 /* msec */

#define CCID_BRIDGE_MSG_TIMEOUT 500 /* msec */

#define CCID_BRIDGE_MSG_TIMEOUT 1000 /* msec */

struct ccid_bridge {

	struct usb_device *udev;