diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:20:01 (GMT) |
| commit | 46864e3149aabfe369f1c469951909b9dc7d53bf (patch) | |
| tree | 5a57c938836d6f2853beaa123d568d128ab76349 /drivers/net/wireless | |
| parent | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (diff) | |
| parent | 948a4eec975b0f231c6a55eaaff3e3bdcf4cdf70 (diff) | |
| download | linux-fsl-qoriq-46864e3149aabfe369f1c469951909b9dc7d53bf.tar.xz | |
Merge branch 'sdk-kernel-3.12' into sdk-v1.6.x
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index 4feb35a..8c64627 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -164,7 +164,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev, valid = rt2x00_get_field32(tx_status, TX_STA_FIFO_VALID); if (valid) { - if (!kfifo_put(&rt2x00dev->txstatus_fifo, &tx_status)) + if (!kfifo_put(&rt2x00dev->txstatus_fifo, tx_status)) rt2x00_warn(rt2x00dev, "TX status FIFO overrun\n"); queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work); |