p54: use request_firmware_direct() for optional EEPROM override
The p54 driver uses request_firmware() twice, once for actual firmware and then another time for an optional user overide on EEPROM, 3826.eeprom. The custom EEPROM is optional but if not present we'll introduce an extra lag of 60 seconds with udev present. Annotate we don't want udev nonsense here to avoid the lag in case its not present. This was found with the following SmPL patch. @ firmware_not_critical @ expression cf; expression config_file; expression dev; int ret; identifier l; statement S; @@ - ret = request_firmware(&cf, config_file, dev); + ret = request_firmware_direct(&cf, config_file, dev); if (ret < 0) { ... when != goto l; when != return ret; when any } else { ... release_firmware(cf); ... } Cc: Takashi Iwai <tiwai@suse.de> Cc: Christian Lamparter <chunkeey@googlemail.com> Cc: linux-wireless@vger.kernel.org Cc: cocci@systeme.lip6.fr Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> Acked-By: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
76ac9ed6ff
commit
80140b71e0
|
@ -193,7 +193,7 @@ static int p54spi_request_eeprom(struct ieee80211_hw *dev)
|
|||
/* allow users to customize their eeprom.
|
||||
*/
|
||||
|
||||
ret = request_firmware(&eeprom, "3826.eeprom", &priv->spi->dev);
|
||||
ret = request_firmware_direct(&eeprom, "3826.eeprom", &priv->spi->dev);
|
||||
if (ret < 0) {
|
||||
#ifdef CONFIG_P54_SPI_DEFAULT_EEPROM
|
||||
dev_info(&priv->spi->dev, "loading default eeprom...\n");
|
||||
|
|
Loading…
Reference in New Issue