2010-12-17 14:13:12

by Ben Hutchings

Subject: [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin

My conversion of tehuti to use request_firmware() was confused about
the filename of the firmware blob. Change the driver to match the
blob.

Signed-off-by: Ben Hutchings <[email protected]>
Cc: [email protected] [2.6.32+]
---
drivers/net/tehuti.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 8b3dc1e..296000b 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -324,7 +324,7 @@ static int bdx_fw_load(struct bdx_priv *priv)
ENTER;
master = READ_REG(priv, regINIT_SEMAPHORE);
if (!READ_REG(priv, regINIT_STATUS) && master) {
- rc = request_firmware(&fw, "tehuti/firmware.bin", &priv->pdev->dev);
+ rc = request_firmware(&fw, "tehuti/bdx.bin", &priv->pdev->dev);
if (rc)
goto out;
bdx_tx_push_desc_safe(priv, (char *)fw->data, fw->size);
@@ -2510,4 +2510,4 @@ module_exit(bdx_module_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(BDX_DRV_DESC);
-MODULE_FIRMWARE("tehuti/firmware.bin");
+MODULE_FIRMWARE("tehuti/bdx.bin");
--
1.7.2.3

2010-12-17 15:35:28

by Andy Gospodarek

Subject: Re: [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin

On Fri, Dec 17, 2010 at 02:13:03PM +0000, Ben Hutchings wrote:
> My conversion of tehuti to use request_firmware() was confused about
> the filename of the firmware blob. Change the driver to match the
> blob.
>
> Signed-off-by: Ben Hutchings <[email protected]>

Thanks for doing that, Ben.

Signed-off-by: Andy Gospodarek <[email protected]>

2010-12-17 18:16:10

by David Miller

Subject: Re: [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin

From: Ben Hutchings <[email protected]>
Date: Fri, 17 Dec 2010 14:13:03 +0000

> My conversion of tehuti to use request_firmware() was confused about
> the filename of the firmware blob. Change the driver to match the
> blob.
>
> Signed-off-by: Ben Hutchings <[email protected]>

Applied and queued up for -stable, thanks.