Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d3ea166 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jeff Garzik
Browse files

[PATCH] spidernet: check if firmware was loaded correctly 



Uploading the device firmware may fail if wrong input data
was provided by the user. This checks for the condition.

From: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: default avatarJens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arndb@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent c2e5b352

drivers/net/spider_net.c

+8 −4
Original line number Diff line number Diff line
@@ -1836,7 +1836,7 @@ spider_net_setup_phy(struct spider_net_card *card) 
 * spider_net_download_firmware loads the firmware opened by

 * spider_net_init_firmware into the adapter.

 */

static void

static int

spider_net_download_firmware(struct spider_net_card *card,

			     const struct firmware *firmware)

{
@@ -1857,8 +1857,13 @@ spider_net_download_firmware(struct spider_net_card *card, 
		}

	}



	if (spider_net_read_reg(card, SPIDER_NET_GSINIT))

		return -EIO;



	spider_net_write_reg(card, SPIDER_NET_GSINIT,

			     SPIDER_NET_RUN_SEQ_VALUE);



	return 0;

}



/**
@@ -1909,8 +1914,7 @@ spider_net_init_firmware(struct spider_net_card *card) 
		goto out;

	}



	spider_net_download_firmware(card, firmware);



	if (!spider_net_download_firmware(card, firmware))

		err = 0;

out:

	release_firmware(firmware);