netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin
@ 2010-12-17 14:13 Ben Hutchings
  2010-12-17 15:34 ` Andy Gospodarek
  2010-12-17 18:16 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Ben Hutchings @ 2010-12-17 14:13 UTC (permalink / raw)
  To: David Miller
  Cc: Joe Jin, Alexander Indenbaum, Andy Gospodarek, netdev,
	linux-kernel, Guru Anbalagane, greg.marsden@oracle.com,
	DuanZhenzhong, Jaswinder Singh Rajput

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 <ben@decadent.org.uk>
Cc: stable@kernel.org [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

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

* Re: [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin
  2010-12-17 14:13 [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin Ben Hutchings
@ 2010-12-17 15:34 ` Andy Gospodarek
  2010-12-17 18:16 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Andy Gospodarek @ 2010-12-17 15:34 UTC (permalink / raw)
  To: Ben Hutchings
  Cc: David Miller, Joe Jin, Alexander Indenbaum, Andy Gospodarek,
	netdev, linux-kernel, Guru Anbalagane, greg.marsden@oracle.com,
	DuanZhenzhong, Jaswinder Singh Rajput

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 <ben@decadent.org.uk>

Thanks for doing that, Ben.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>

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

* Re: [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin
  2010-12-17 14:13 [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin Ben Hutchings
  2010-12-17 15:34 ` Andy Gospodarek
@ 2010-12-17 18:16 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-12-17 18:16 UTC (permalink / raw)
  To: ben
  Cc: joe.jin, baum, andy, netdev, linux-kernel, guru.anbalagane,
	greg.marsden, zhenzhong.duan, jaswinder

From: Ben Hutchings <ben@decadent.org.uk>
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 <ben@decadent.org.uk>

Applied and queued up for -stable, thanks.

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

end of thread, other threads:[~2010-12-17 18:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-17 14:13 [PATCH net-2.6] tehuti: Firmware filename is tehuti/bdx.bin Ben Hutchings
2010-12-17 15:34 ` Andy Gospodarek
2010-12-17 18:16 ` David Miller

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).