dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Arnd Bergmann 2006-01-12 17:16:41 -05:00 committed by Jeff Garzik
parent c2e5b352fc
commit 0d3ea1666f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/spider_net.c
View File

@ -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,9 +1914,8 @@ spider_net_init_firmware(struct spider_net_card *card)
goto out;
}
spider_net_download_firmware(card, firmware);
err = 0;
if (!spider_net_download_firmware(card, firmware))
err = 0;
out:
release_firmware(firmware);