[kernel] r16712 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Dec 18 05:02:37 2010
New Revision: 16712

Log:
tehuti: Firmware filename is tehuti/bdx.bin

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Dec 18 04:57:12 2010	(r16711)
+++ dists/sid/linux-2.6/debian/changelog	Sat Dec 18 05:02:37 2010	(r16712)
@@ -11,6 +11,7 @@
     thanks to Vitaly Kuznetsov (Closes: #555835)
   * [powerpc] linux-base: Run ybin after updating yaboot.conf
     (Closes: #607284)
+  * tehuti: Firmware filename is tehuti/bdx.bin
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch	Sat Dec 18 05:02:37 2010	(r16712)
@@ -0,0 +1,39 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 17 Dec 2010 10:16:23 -0800
+Subject: [PATCH] tehuti: Firmware filename is tehuti/bdx.bin
+
+commit 46814e08d80f87449b5adb3d549a3cae6f9f8148 upstream.
+
+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 at decadent.org.uk>
+Signed-off-by: Andy Gospodarek <andy at greyhouse.net>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ 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
+

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Sat Dec 18 04:57:12 2010	(r16711)
+++ dists/sid/linux-2.6/debian/patches/series/30	Sat Dec 18 05:02:37 2010	(r16712)
@@ -2,3 +2,4 @@
 + bugfix/all/SCSI-mpt2sas-fix-incorrect-scsi_dma_map-error-check.patch
 + bugfix/x86/intel-iommu-Force-disable-IOMMU-for-iGFX-on-broken-C.patch
 + features/all/USB-Unusual-Device-support-for-Samsung-YP-CP3-MP4-Pl.patch
++ bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch