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

Commit 5b4c6b4f authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kalle Valo
Browse files

p54: add handling of the signal case 



if(!wait_for_completion_interruptible_timeout(...))
only handles the timeout case - this patch adds handling the
signal case the same as timeout.

Signed-off-by: default avatarNicholas Mc Guire <der.herr@hofr.at>
Acked-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c0719334

drivers/net/wireless/p54/fwio.c

+6 −3
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ int p54_download_eeprom(struct p54_common *priv, void *buf, 
	struct sk_buff *skb;

	size_t eeprom_hdr_size;

	int ret = 0;

	long timeout;



	if (priv->fw_var >= 0x509)

		eeprom_hdr_size = sizeof(*eeprom_hdr);
@@ -249,9 +250,11 @@ int p54_download_eeprom(struct p54_common *priv, void *buf, 


	p54_tx(priv, skb);



	if (!wait_for_completion_interruptible_timeout(

	     &priv->eeprom_comp, HZ)) {

		wiphy_err(priv->hw->wiphy, "device does not respond!\n");

	timeout = wait_for_completion_interruptible_timeout(

			&priv->eeprom_comp, HZ);

	if (timeout <= 0) {

		wiphy_err(priv->hw->wiphy,

			"device does not respond or signal received!\n");

		ret = -EBUSY;

	}

	priv->eeprom = NULL;