[PATCH] Bluetooth: btmrvl_sdio: look for sd8688 firmware in alternate place

[Lubomir Rintel]

On Mon, 2013-01-21 at 01:12 +0000, Ben Hutchings wrote:
> On Fri, 2013-01-18 at 08:33 +0100, Lubomir Rintel wrote:
> > On Tue, 2013-01-08 at 22:35 -0800, Marcel Holtmann wrote:
> > > Hi Lubomir,
> > > 
> > > > > > > linux-firmware ships the sd8688* firmware images that are shared with
> > > > > > > libertas_sdio WiFi driver under libertas/. libertas_sdio looks in both places
> > > > > > > and so should we.
> > > > > > >
> > > > > > > Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
> > > > > > > ---
> > > > > > >  drivers/bluetooth/btmrvl_sdio.c |   24 ++++++++++++++++++++++--
> > > > > > >  drivers/bluetooth/btmrvl_sdio.h |    6 ++++--
> > > > > > >  2 files changed, 26 insertions(+), 4 deletions(-)
> > > > > > 
> > > > > > NAK from me on this one. I do not want the driver to check two
> > > > > > locations. That is what userspace can work around.
> > > > > > 
> > > > > > If we want to unify the location between the WiFi driver and the
> > > > > > Bluetooth driver, I am fine with that, but seriously, just pick one over
> > > > > > the other. I do not care which one.
> > > > > 
> > > > > The unified location is mrvl/ directory.
> > > > > 
> > > > > We can probably move SD8688 firmware & helper binaries to mrvl/ and have both drivers grab the images there?
> > > > 
> > > > That would break existing setups, wouldn't it?
> > > > 
> > > > I was under impression (commit 3d32a58b) that we care about
> > > > compatibility here. Do we?
> > > 
> > > that is what symlinks are for.
> > 
> > David, Ben: please pull the following branch then:
> > git pull git://github.com/lkundrak/linux-firmware.git sd8688-move
> > 
> > Thank you!
> 
> The symlinks are broken, and you didn't update WHENCE.

Oops, sorry for that. Fixed now, please pull:
git pull git://github.com/lkundrak/linux-firmware.git sd8688-move

Thank you!