aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-08-14 19:07:21 -0400
committerDavid S. Miller <davem@davemloft.net>2009-08-14 19:07:21 -0400
commitcf9911166113e471e1796eaf273982d8e43b138d (patch)
tree141ca87902690967620d6297c88746e2adb6dae5 /drivers/net/wireless/rt2x00/rt2x00.h
parentdeeb16dc24b68cbdca72dc717ae82178a6644801 (diff)
parent88512935a24305fea7aecc9ba4d675869e97fc2a (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 5bc100db28d4..99e89596cef6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -851,13 +851,15 @@ struct rt2x00_dev {
851static inline void rt2x00_rf_read(struct rt2x00_dev *rt2x00dev, 851static inline void rt2x00_rf_read(struct rt2x00_dev *rt2x00dev,
852 const unsigned int word, u32 *data) 852 const unsigned int word, u32 *data)
853{ 853{
854 *data = rt2x00dev->rf[word]; 854 BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));
855 *data = rt2x00dev->rf[word - 1];
855} 856}
856 857
857static inline void rt2x00_rf_write(struct rt2x00_dev *rt2x00dev, 858static inline void rt2x00_rf_write(struct rt2x00_dev *rt2x00dev,
858 const unsigned int word, u32 data) 859 const unsigned int word, u32 data)
859{ 860{
860 rt2x00dev->rf[word] = data; 861 BUG_ON(word < 1 || word > rt2x00dev->ops->rf_size / sizeof(u32));
862 rt2x00dev->rf[word - 1] = data;
861} 863}
862 864
863/* 865/*