From bf7e380f98252b0fccb60221db7d576ff32c8098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Thu, 25 Oct 2012 21:44:09 +0000 Subject: [PATCH] --- yaml --- r: 340515 b: refs/heads/master c: 7b1e0cba0372c011fc9128a772cf668e70ba9219 h: refs/heads/master i: 340513: ce6da94b3a94116ccbdbced001fd6b75da464825 340511: 5f3992f56d52f92d0047bd6c794da10daa11cf3c v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/cdc_ncm.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ec55ca313d5c..3be6056539cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a7c6cc646782b854b036d287611a0659c40fc9d +refs/heads/master: 7b1e0cba0372c011fc9128a772cf668e70ba9219 diff --git a/trunk/drivers/net/usb/cdc_ncm.c b/trunk/drivers/net/usb/cdc_ncm.c index 397de6396da6..ddc7b8880f60 100644 --- a/trunk/drivers/net/usb/cdc_ncm.c +++ b/trunk/drivers/net/usb/cdc_ncm.c @@ -819,6 +819,8 @@ static void cdc_ncm_txpath_bh(unsigned long param) netif_tx_lock_bh(ctx->netdev); usbnet_start_xmit(NULL, ctx->netdev); netif_tx_unlock_bh(ctx->netdev); + } else { + spin_unlock_bh(&ctx->mtx); } }