diff mbox series

net/wireless/ray_cs: Check of ioremap return value

Message ID 20211230022926.1846757-1-jiasheng@iscas.ac.cn (mailing list archive)
State Accepted
Commit 7e4760713391ee46dc913194b33ae234389a174e
Delegated to: Kalle Valo
Headers show
Series net/wireless/ray_cs: Check of ioremap return value | expand

Commit Message

Jiasheng Jiang Dec. 30, 2021, 2:29 a.m. UTC
As the possible failure of the ioremap(), the 'local->sram' and other
two could be NULL.
Therefore it should be better to check it in order to avoid the later
dev_dbg.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
 drivers/net/wireless/ray_cs.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Kalle Valo Feb. 1, 2022, 12:24 p.m. UTC | #1
Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote:

> As the possible failure of the ioremap(), the 'local->sram' and other
> two could be NULL.
> Therefore it should be better to check it in order to avoid the later
> dev_dbg.
> 
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>

Patch applied to wireless-next.git, thanks.

7e4760713391 ray_cs: Check ioremap return value
diff mbox series

Patch

diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 590bd974d94f..556b9713e99c 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -382,6 +382,8 @@  static int ray_config(struct pcmcia_device *link)
 		goto failed;
 	local->sram = ioremap(link->resource[2]->start,
 			resource_size(link->resource[2]));
+	if (!local->sram)
+		goto failed;
 
 /*** Set up 16k window for shared memory (receive buffer) ***************/
 	link->resource[3]->flags |=
@@ -396,6 +398,8 @@  static int ray_config(struct pcmcia_device *link)
 		goto failed;
 	local->rmem = ioremap(link->resource[3]->start,
 			resource_size(link->resource[3]));
+	if (!local->rmem)
+		goto failed;
 
 /*** Set up window for attribute memory ***********************************/
 	link->resource[4]->flags |=
@@ -410,6 +414,8 @@  static int ray_config(struct pcmcia_device *link)
 		goto failed;
 	local->amem = ioremap(link->resource[4]->start,
 			resource_size(link->resource[4]));
+	if (!local->amem)
+		goto failed;
 
 	dev_dbg(&link->dev, "ray_config sram=%p\n", local->sram);
 	dev_dbg(&link->dev, "ray_config rmem=%p\n", local->rmem);