summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-23 03:32:41 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-23 03:32:41 -0700
commit028e2cf766ddb07005d78ba0fef4f9350571c808 (patch)
tree52feae7a290be2e0ee853f3bc47fbe4e2b66974e /drivers/net
parent03ead478748601fe10f57bd241427b3feb40edeb (diff)
parent0d1ea72d6eb1accd1dd3777c72dbacb69a11d497 (diff)
Merge "drivers: net: Change timeout for query_firmware command"
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/can/spi/qti-can.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/spi/qti-can.c b/drivers/net/can/spi/qti-can.c
index a6fc665d07f4..7db6ecf8f354 100644
--- a/drivers/net/can/spi/qti-can.c
+++ b/drivers/net/can/spi/qti-can.c
@@ -44,7 +44,7 @@
#define DRIVER_MODE_RAW_FRAMES 0
#define DRIVER_MODE_PROPERTIES 1
#define DRIVER_MODE_AMB 2
-#define QUERY_FIRMWARE_TIMEOUT_MS 20
+#define QUERY_FIRMWARE_TIMEOUT_MS 100
struct qti_can {
struct net_device **netdev;