Re: [PATCH 1/2] orinoco: reload firmware on resume

[Dave <kilroyd@googlemail.com>]

Andrey Borzenkov wrote:
> On resume card state is likely lost so we have to reload firmware
> again.
> 
> Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru>
> 
> ---
> 
> This is non-functional without second patch. Currently you simply
> have no way to load request firmware from user space in ->resume.

Does it work when you compile the firmware into the kernel image
with CONFIG_FIRMWARE_KERNEL, CONFIG_EXTRA_FIRMWARE and
CONFIG_EXTRA_FIRMWARE_DIR?
 
> --- a/drivers/net/wireless/orinoco.c
> +++ b/drivers/net/wireless/orinoco.c
> @@ -2298,9 +2298,14 @@ int orinoco_reinit_firmware(struct net_device *dev)
>  {
>  	struct orinoco_private *priv = netdev_priv(dev);
>  	struct hermes *hw = &priv->hw;
> -	int err;
> +	int err = 0;

The explicit initialisation is unneccesary.

>  	err = hermes_init(hw);
> +	if (priv->do_fw_download && !err) {

Otherwise this looks right.


Regards,

Dave.