Re: [PATCH v2] brcm80211: handle missing firmware

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Sep 28, 2010 at 11:34:44AM -0700, Brett Rudley wrote:
> 
> Resubmit this time without irrelevent blather:
> 
> Handle non-extistent firmware more gracefully.
> 
> Signed-off-by: Brett Rudley <brudley@xxxxxxxxxxxx>
> ---
>  drivers/staging/brcm80211/sys/wl_mac80211.c |   43 +++++++++++++++-----------
>  1 files changed, 25 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
> index 5400360..084e2f8 100644
> --- a/drivers/staging/brcm80211/sys/wl_mac80211.c
> +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
> @@ -187,6 +187,7 @@ static struct pci_device_id wl_id_table[] = {
>  };
>  
>  MODULE_DEVICE_TABLE(pci, wl_id_table);
> +static void __devexit wl_remove(struct pci_dev *pdev);
>  #endif				/* !BCMSDIO */
>  
>  #ifdef BCMSDIO
> @@ -902,9 +903,11 @@ static wl_info_t *wl_attach(uint16 vendor, uint16 device, ulong regs,
>  #ifndef WLC_HIGH_ONLY
>  	/* prepare ucode */
>  	if (wl_request_fw(wl, (struct pci_dev *)btparam)) {
> -		printf("%s: %s driver failed\n", KBUILD_MODNAME,
> -		       EPI_VERSION_STR);
> -		goto fail;
> +		printf("%s: Failed to find firmware usually in %s\n",
> +			KBUILD_MODNAME, "/lib/firmware/brcm");

In the future, please use dev_err().  Also, if you ran checkpatch
against this patch, it would show you the problem with it (hint, no
printk level...)

I'll take it this time...

thanks,

greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel


[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux