* [PATCH] ath10k: fix a NULL vs IS_ERR() check
@ 2018-11-26 8:11 Dan Carpenter
2018-11-26 8:24 ` Kalle Valo
2018-12-20 17:05 ` Kalle Valo
0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2018-11-26 8:11 UTC (permalink / raw)
To: Kalle Valo, Govind Singh; +Cc: ath10k, linux-wireless, kernel-janitors
The devm_memremap() function doesn't return NULLs, it returns error
pointers.
Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/wireless/ath/ath10k/qmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index f0429bee35c2..37b3bd629f48 100644
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -931,9 +931,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size)
qmi->msa_mem_size = resource_size(&r);
qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size,
MEMREMAP_WT);
- if (!qmi->msa_va) {
+ if (IS_ERR(qmi->msa_va)) {
dev_err(dev, "failed to map memory region: %pa\n", &r.start);
- return -EBUSY;
+ return PTR_ERR(qmi->msa_va);
}
} else {
qmi->msa_va = dmam_alloc_coherent(dev, msa_size,
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ath10k: fix a NULL vs IS_ERR() check
2018-11-26 8:11 [PATCH] ath10k: fix a NULL vs IS_ERR() check Dan Carpenter
@ 2018-11-26 8:24 ` Kalle Valo
2018-11-26 8:30 ` Dan Carpenter
2018-12-20 17:05 ` Kalle Valo
1 sibling, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2018-11-26 8:24 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Govind Singh, ath10k, linux-wireless, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> The devm_memremap() function doesn't return NULLs, it returns error
> pointers.
>
> Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/net/wireless/ath/ath10k/qmi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
> index f0429bee35c2..37b3bd629f48 100644
> --- a/drivers/net/wireless/ath/ath10k/qmi.c
> +++ b/drivers/net/wireless/ath/ath10k/qmi.c
> @@ -931,9 +931,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size)
> qmi->msa_mem_size = resource_size(&r);
> qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size,
> MEMREMAP_WT);
> - if (!qmi->msa_va) {
> + if (IS_ERR(qmi->msa_va)) {
> dev_err(dev, "failed to map memory region: %pa\n", &r.start);
> - return -EBUSY;
> + return PTR_ERR(qmi->msa_va);
That's a very good find!
But how has this even worked before? I would assume devm_memremap()
always returns a non-NULL value and ath10k would have interpreted that
as an error?
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ath10k: fix a NULL vs IS_ERR() check
2018-11-26 8:24 ` Kalle Valo
@ 2018-11-26 8:30 ` Dan Carpenter
2018-11-26 13:06 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2018-11-26 8:30 UTC (permalink / raw)
To: Kalle Valo; +Cc: Govind Singh, ath10k, linux-wireless, kernel-janitors
On Mon, Nov 26, 2018 at 10:24:38AM +0200, Kalle Valo wrote:
> Dan Carpenter <dan.carpenter@oracle.com> writes:
>
> > The devm_memremap() function doesn't return NULLs, it returns error
> > pointers.
> >
> > Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/net/wireless/ath/ath10k/qmi.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
> > index f0429bee35c2..37b3bd629f48 100644
> > --- a/drivers/net/wireless/ath/ath10k/qmi.c
> > +++ b/drivers/net/wireless/ath/ath10k/qmi.c
> > @@ -931,9 +931,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size)
> > qmi->msa_mem_size = resource_size(&r);
> > qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size,
> > MEMREMAP_WT);
> > - if (!qmi->msa_va) {
> > + if (IS_ERR(qmi->msa_va)) {
> > dev_err(dev, "failed to map memory region: %pa\n", &r.start);
> > - return -EBUSY;
> > + return PTR_ERR(qmi->msa_va);
>
> That's a very good find!
>
> But how has this even worked before?
This only changes the error path. Presumably it always succeeds in real
life.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] ath10k: fix a NULL vs IS_ERR() check
2018-11-26 8:30 ` Dan Carpenter
@ 2018-11-26 13:06 ` Kalle Valo
0 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2018-11-26 13:06 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Govind Singh, ath10k, linux-wireless, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> On Mon, Nov 26, 2018 at 10:24:38AM +0200, Kalle Valo wrote:
>> Dan Carpenter <dan.carpenter@oracle.com> writes:
>>
>> > The devm_memremap() function doesn't return NULLs, it returns error
>> > pointers.
>> >
>> > Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
>> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> > ---
>> > drivers/net/wireless/ath/ath10k/qmi.c | 4 ++--
>> > 1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
>> > index f0429bee35c2..37b3bd629f48 100644
>> > --- a/drivers/net/wireless/ath/ath10k/qmi.c
>> > +++ b/drivers/net/wireless/ath/ath10k/qmi.c
>> > @@ -931,9 +931,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size)
>> > qmi->msa_mem_size = resource_size(&r);
>> > qmi->msa_va = devm_memremap(dev, qmi->msa_pa, qmi->msa_mem_size,
>> > MEMREMAP_WT);
>> > - if (!qmi->msa_va) {
>> > + if (IS_ERR(qmi->msa_va)) {
>> > dev_err(dev, "failed to map memory region: %pa\n", &r.start);
>> > - return -EBUSY;
>> > + return PTR_ERR(qmi->msa_va);
>>
>> That's a very good find!
>>
>> But how has this even worked before?
>
> This only changes the error path. Presumably it always succeeds in real
> life.
Ah, I missed the "!" operator. Yeah, I think you are correct. I'll queue
this for -next then.
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ath10k: fix a NULL vs IS_ERR() check
2018-11-26 8:11 [PATCH] ath10k: fix a NULL vs IS_ERR() check Dan Carpenter
2018-11-26 8:24 ` Kalle Valo
@ 2018-12-20 17:05 ` Kalle Valo
1 sibling, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2018-12-20 17:05 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Govind Singh, ath10k, linux-wireless, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> The devm_memremap() function doesn't return NULLs, it returns error
> pointers.
>
> Fixes: ba94c753ccb4 ("ath10k: add QMI message handshake for wcn3990 client")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
c28dcbce0592 ath10k: fix a NULL vs IS_ERR() check
--
https://patchwork.kernel.org/patch/10697755/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-20 17:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-26 8:11 [PATCH] ath10k: fix a NULL vs IS_ERR() check Dan Carpenter
2018-11-26 8:24 ` Kalle Valo
2018-11-26 8:30 ` Dan Carpenter
2018-11-26 13:06 ` Kalle Valo
2018-12-20 17:05 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).