From fdb63ab825dcbc9709f9a1a4ccfdec5d5fcd1dff Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 6 May 2009 15:34:01 +0000 Subject: [PATCH] fix qla1280 request_firmware() call svn path=/dists/sid/linux-2.6/; revision=13583 --- debian/changelog | 4 ++ ...ff-by-some-error-in-firmware-loading.patch | 38 +++++++++++++++++++ debian/patches/series/5 | 1 + 3 files changed, 43 insertions(+) create mode 100644 debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch diff --git a/debian/changelog b/debian/changelog index 5af3926f5..b5a3f5a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Mon, 04 May 2009 13:40:51 -0600 linux-2.6 (2.6.29-4) unstable; urgency=low diff --git a/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch b/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch new file mode 100644 index 000000000..e4bebe698 --- /dev/null +++ b/debian/patches/bugfix/all/0001-qla1280-Fix-off-by-some-error-in-firmware-loading.patch @@ -0,0 +1,38 @@ +From 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 Mon Sep 17 00:00:00 2001 +From: David Woodhouse +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 +Tested-by: Jeremy Higdon +--- + 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 + diff --git a/debian/patches/series/5 b/debian/patches/series/5 index 9c78db541..c8dd93f94 100644 --- a/debian/patches/series/5 +++ b/debian/patches/series/5 @@ -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