From c4d79e344bd580d85821390d49f92dced7d8e125 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 24 Mar 2013 19:26:29 +0100 Subject: [PATCH] rt2x00: rt2800lib: use correct txpower calculation function for RT3883 Signed-off-by: Gabor Juhos --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -4612,7 +4612,8 @@ static void rt2800_config_txpower(struct struct ieee80211_channel *chan, int power_level) { - if (rt2x00_rt(rt2x00dev, RT3593)) + if (rt2x00_rt(rt2x00dev, RT3593) || + rt2x00_rt(rt2x00dev, RT3883)) rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level); else rt2800_config_txpower_rt28xx(rt2x00dev, chan, power_level); rt/upstream/'>openwrt/upstream
upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
blob: c4f36e1fce5c495b6d3e8ed74924498a8e45c630 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 8fa158cb700b0fdbb76ede07ec2103b5930e0913 Mon Sep 17 00:00:00 2001
From: HiassofT <github@hias.horus.com>
Date: Wed, 6 Apr 2016 21:45:01 +0200
Subject: [PATCH] Revert "bcm2835-dma: Fix dreq not set for slave transfers"

This reverts commit 8ad957e866a1fe1450f663f2b00a57d7de44904c.



DMA channels are set in devicetree, thus dreq will be set,

and this commit is no longer needed.



Signed-off-by: Matthias Reichl <hias@horus.com>
---
 drivers/dma/bcm2835-dma.c | 2 --
 1 file changed, 2 deletions(-)

--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -679,8 +679,6 @@ static int bcm2835_dma_slave_config(stru
 	}
 
 	c->cfg = *cfg;
-	if (!c->dreq)
-		c->dreq = cfg->slave_id;
 
 	return 0;
 }