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

[Maximilian Attems]

Author: maks
Date: Wed May  6 15:34:01 2009
New Revision: 13583

Log:
fix qla1280 request_firmware() call

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed May  6 14:24:11 2009	(r13582)
+++ dists/sid/linux-2.6/debian/changelog	Wed May  6 15:34:01 2009	(r13583)
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.29-5) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * [ia64] Backport rtc-efi driver from mainline
 
+  [ maximilian attems ]
+  * qla1280: Fix off-by-some error in firmware loading. (closes: #527265)
+
  -- dann frazier <dannf at debian.org>  Mon, 04 May 2009 13:40:51 -0600
 
 linux-2.6 (2.6.29-4) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch	Wed May  6 15:34:01 2009	(r13583)
@@ -0,0 +1,38 @@
+From 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse at intel.com>
+Date: Wed, 8 Apr 2009 01:22:36 -0700
+Subject: [PATCH] qla1280: Fix off-by-some error in firmware loading.
+
+We were calculating the wrong address for the start of the data.
+
+Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
+Tested-by: Jeremy Higdon <jeremy at sgi.com>
+---
+ drivers/scsi/qla1280.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
+index 351b56c..d030db9 100644
+--- a/drivers/scsi/qla1280.c
++++ b/drivers/scsi/qla1280.c
+@@ -1663,7 +1663,7 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha)
+ 
+ 	/* Load RISC code. */
+ 	risc_address = ha->fwstart;
+-	fw_data = (const __le16 *)&fw->data[4];
++	fw_data = (const __le16 *)&fw->data[6];
+ 	risc_code_size = (fw->size - 6) / 2;
+ 
+ 	for (i = 0; i < risc_code_size; i++) {
+@@ -1722,7 +1722,7 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha)
+ 
+ 	/* Load RISC code. */
+ 	risc_address = ha->fwstart;
+-	fw_data = (const __le16 *)&fw->data[4];
++	fw_data = (const __le16 *)&fw->data[6];
+ 	risc_code_size = (fw->size - 6) / 2;
+ 
+ 	dprintk(1, "%s: DMA RISC code (%i) words\n",
+-- 
+1.6.2.4
+

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	Wed May  6 14:24:11 2009	(r13582)
+++ dists/sid/linux-2.6/debian/patches/series/5	Wed May  6 15:34:01 2009	(r13583)
@@ -1,2 +1,3 @@
 + features/ia64/rtc-efi.patch
 + features/ia64/rtc-inline-LEAP_YEAR.patch
++ bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch