From 15a2cae4b121b0c5f8bfb9d6978e4ffb9432c443 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 29 Jun 2012 14:24:12 +0200 Subject: [PATCH] --- yaml --- r: 315225 b: refs/heads/master c: bd408b33363035275403cfaadf2683d8c8e22dd7 h: refs/heads/master i: 315223: df08ee232ac9ae36c5227473361c9deedfaee2c6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/rx.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 84bb454e1678..096e4130df9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 346c265a48169d73a69c88ce9d6b65e6bb3b1f20 +refs/heads/master: bd408b33363035275403cfaadf2683d8c8e22dd7 diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c b/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c index be143eb4aa4f..39a6ca1f009c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/rx.c @@ -879,9 +879,6 @@ static irqreturn_t iwl_isr(int irq, void *data) lockdep_assert_held(&trans_pcie->irq_lock); - if (!trans) - return IRQ_NONE; - trace_iwlwifi_dev_irq(trans->dev); /* Disable (but don't clear!) interrupts here to avoid