diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-06 13:21:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-06 13:21:38 -0700 |
| commit | 1d0af2abf05eb3cfd4155e77d2468d04fa08582b (patch) | |
| tree | bf5ce3e330212b66dbcecf010a3e93a9710f61a2 /drivers/net/wireless/ath/wil6210/ioctl.c | |
| parent | 3eb3dbc346d1b5f1d2fc9d6c31be3787f6bedc77 (diff) | |
| parent | 02e16582249c1bccfe57fabfa604a4258331a414 (diff) | |
Merge "wil6210: support devices with different PCIe bar size"
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/ioctl.c')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/wil6210/ioctl.c b/drivers/net/wireless/ath/wil6210/ioctl.c index bbdd232df3b7..f8d2c209482c 100644 --- a/drivers/net/wireless/ath/wil6210/ioctl.c +++ b/drivers/net/wireless/ath/wil6210/ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Qualcomm Atheros, Inc. + * Copyright (c) 2014,2017 Qualcomm Atheros, Inc. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -54,7 +54,7 @@ static void __iomem *wil_ioc_addr(struct wil6210_priv *wil, uint32_t addr, } off = a - wil->csr; - if (size >= WIL6210_MEM_SIZE - off) { + if (size >= wil->bar_size - off) { wil_err(wil, "Requested block does not fit into memory: " "off = 0x%08x size = 0x%08x\n", off, size); return NULL; |