diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-27 02:46:15 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-27 02:46:15 +0300 |
| commit | 5b79c2af667c0e2684f2a6dbf6439074b78f490c (patch) | |
| tree | efda2b94317c914fef0bfb25fe5ada9e253d5415 /net/wireless/reg.c | |
| parent | e52cde71709348c0d67bf0f213b438fa4d6cf9a9 (diff) | |
| parent | bc2dbc5420e82560e650f8531ceca597441ca171 (diff) | |
| download | linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e55099b1785d..bbe6298e4bb9 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -916,6 +916,9 @@ int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr, const struct fwdb_header *hdr = regdb; const struct fwdb_country *country; + if (!regdb) + return -ENODATA; + if (IS_ERR(regdb)) return PTR_ERR(regdb); |