linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ath3k: add support for new firmware
@ 2010-06-03 11:20 Vikram
  2010-06-03 17:34 ` Marcel Holtmann
  0 siblings, 1 reply; 3+ messages in thread
From: Vikram @ 2010-06-03 11:20 UTC (permalink / raw)
  To: linux-bluetooth, marcel

updated new firmware has few critical bug fixes and shared antenna
support.

Signed-off-by: Vikram Kandukuri <vkandukuri@atheros.com>
---
 drivers/bluetooth/ath3k.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 128cae4..7bda549 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -122,9 +122,12 @@ static int ath3k_probe(struct usb_interface *intf,
 
 	data->udev = udev;
 
-	if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
-		kfree(data);
-		return -EIO;
+	if (request_firmware(&firmware, "ath3k-2.fw", &udev->dev) < 0) {
+		BT_DBG("requesting old firmware");
+		if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
+			kfree(data);
+			return -EIO;
+		}
 	}
 
 	size = max_t(uint, firmware->size, 4096);
-- 
1.7.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ath3k: add support for new firmware
  2010-06-03 11:20 [PATCH] ath3k: add support for new firmware Vikram
@ 2010-06-03 17:34 ` Marcel Holtmann
  2010-10-01 20:56   ` Luis R. Rodriguez
  0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2010-06-03 17:34 UTC (permalink / raw)
  To: Vikram; +Cc: linux-bluetooth

Hi Vikram,

> updated new firmware has few critical bug fixes and shared antenna
> support.
> 
> Signed-off-by: Vikram Kandukuri <vkandukuri@atheros.com>
> ---
>  drivers/bluetooth/ath3k.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
> index 128cae4..7bda549 100644
> --- a/drivers/bluetooth/ath3k.c
> +++ b/drivers/bluetooth/ath3k.c
> @@ -122,9 +122,12 @@ static int ath3k_probe(struct usb_interface *intf,
>  
>  	data->udev = udev;
>  
> -	if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
> -		kfree(data);
> -		return -EIO;
> +	if (request_firmware(&firmware, "ath3k-2.fw", &udev->dev) < 0) {
> +		BT_DBG("requesting old firmware");
> +		if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
> +			kfree(data);
> +			return -EIO;
> +		}
>  	}
>  
>  	size = max_t(uint, firmware->size, 4096);

can we just have a list of supported firmware in a table instead of just
hardcoding this. I think something similar to what iwlwifi for WiFi has
beend doing would be nice.

Regards

Marcel



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ath3k: add support for new firmware
  2010-06-03 17:34 ` Marcel Holtmann
@ 2010-10-01 20:56   ` Luis R. Rodriguez
  0 siblings, 0 replies; 3+ messages in thread
From: Luis R. Rodriguez @ 2010-10-01 20:56 UTC (permalink / raw)
  To: Marcel Holtmann; +Cc: Vikram, linux-bluetooth, lrodriguez

On Thu, Jun 03, 2010 at 10:34:12AM -0700, Marcel Holtmann wrote:
> Hi Vikram,
> 
> > updated new firmware has few critical bug fixes and shared antenna
> > support.
> > 
> > Signed-off-by: Vikram Kandukuri <vkandukuri@atheros.com>
> > ---
> >  drivers/bluetooth/ath3k.c |    9 ++++++---
> >  1 files changed, 6 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
> > index 128cae4..7bda549 100644
> > --- a/drivers/bluetooth/ath3k.c
> > +++ b/drivers/bluetooth/ath3k.c
> > @@ -122,9 +122,12 @@ static int ath3k_probe(struct usb_interface *intf,
> >  
> >  	data->udev = udev;
> >  
> > -	if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
> > -		kfree(data);
> > -		return -EIO;
> > +	if (request_firmware(&firmware, "ath3k-2.fw", &udev->dev) < 0) {
> > +		BT_DBG("requesting old firmware");
> > +		if (request_firmware(&firmware, "ath3k-1.fw", &udev->dev) < 0) {
> > +			kfree(data);
> > +			return -EIO;
> > +		}
> >  	}
> >  
> >  	size = max_t(uint, firmware->size, 4096);
> 
> can we just have a list of supported firmware in a table instead of just
> hardcoding this. I think something similar to what iwlwifi for WiFi has
> beend doing would be nice.

Vikram, you never followed up so this patch is not yet upstream....
Mind you, ath3k-2.fw is on the linux-firmware.git tree though.

  Luis

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-10-01 20:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-03 11:20 [PATCH] ath3k: add support for new firmware Vikram
2010-06-03 17:34 ` Marcel Holtmann
2010-10-01 20:56   ` Luis R. Rodriguez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).