diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-04 19:45:14 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-04 19:45:14 (GMT) |
| commit | 01925efdf7e03b4b803b5c9f985163d687f7f017 (patch) | |
| tree | 6c318f9bf002efac5ccd87e8edad35863d72bd17 /drivers/net/wireless/cw1200/fwio.c | |
| parent | a1b13b9ad3759dca24c6b721ee026c540a4e6564 (diff) | |
| parent | 8ce9beac4661f576ea0d518b9f086bb52a171a37 (diff) | |
| download | linux-01925efdf7e03b4b803b5c9f985163d687f7f017.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/drv.c
Diffstat (limited to 'drivers/net/wireless/cw1200/fwio.c')
| -rw-r--r-- | drivers/net/wireless/cw1200/fwio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/cw1200/fwio.c index 0b2061b..acdff0f 100644 --- a/drivers/net/wireless/cw1200/fwio.c +++ b/drivers/net/wireless/cw1200/fwio.c @@ -485,7 +485,7 @@ int cw1200_load_firmware(struct cw1200_common *priv) /* Enable interrupt signalling */ priv->hwbus_ops->lock(priv->hwbus_priv); - ret = __cw1200_irq_enable(priv, 2); + ret = __cw1200_irq_enable(priv, 1); priv->hwbus_ops->unlock(priv->hwbus_priv); if (ret < 0) goto unsubscribe; |