diff options
| author | Sungbo Eo <mans0n@gorani.run> | 2022-02-01 02:53:59 +0900 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-19 02:48:26 +0100 |
| commit | d004110ef7b6a656b59ea7a5ca4a3deb4fc7ef99 (patch) | |
| tree | db3fd94b25abb27d19d52f61e2b97d309fc41f67 /package | |
| parent | 0755c18ff114303b9fb06c24c4297bf243856a73 (diff) | |
| download | upstream-d004110ef7b6a656b59ea7a5ca4a3deb4fc7ef99.tar.gz upstream-d004110ef7b6a656b59ea7a5ca4a3deb4fc7ef99.tar.bz2 upstream-d004110ef7b6a656b59ea7a5ca4a3deb4fc7ef99.zip | |
mac80211: rt2x00: fix typo
Add missing semicolon and refresh patches.
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
(cherry picked from commit d826c91704d2baa5e389c225791740e4c61d62c4)
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/mac80211/patches/rt2x00/602-rt2x00-introduce-rt2x00eeprom.patch | 2 | ||||
| -rw-r--r-- | package/kernel/mac80211/patches/rt2x00/603-rt2x00-of_load_eeprom_filename.patch | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/602-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/rt2x00/602-rt2x00-introduce-rt2x00eeprom.patch index bd33b2efbd..21ed9882b0 100644 --- a/package/kernel/mac80211/patches/rt2x00/602-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/kernel/mac80211/patches/rt2x00/602-rt2x00-introduce-rt2x00eeprom.patch @@ -193,7 +193,7 @@ + if (pdata && pdata->eeprom_file_name) + return pdata->eeprom_file_name; + -+ return NULL ++ return NULL; +} + +static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev) diff --git a/package/kernel/mac80211/patches/rt2x00/603-rt2x00-of_load_eeprom_filename.patch b/package/kernel/mac80211/patches/rt2x00/603-rt2x00-of_load_eeprom_filename.patch index 9dffef1812..431e090237 100644 --- a/package/kernel/mac80211/patches/rt2x00/603-rt2x00-of_load_eeprom_filename.patch +++ b/package/kernel/mac80211/patches/rt2x00/603-rt2x00-of_load_eeprom_filename.patch @@ -8,7 +8,7 @@ #include "rt2x00.h" #include "rt2x00lib.h" -@@ -34,11 +35,21 @@ static const char * +@@ -34,10 +35,20 @@ static const char * rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) { struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data; @@ -20,14 +20,12 @@ if (pdata && pdata->eeprom_file_name) return pdata->eeprom_file_name; -- return NULL +#ifdef CONFIG_OF + np = rt2x00dev->dev->of_node; + if (np && of_property_read_string(np, "ralink,eeprom", &eep) == 0) + return eep; +#endif + -+ return NULL; + return NULL; } - static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev) |