.32 patches

6 files changed, 204 insertions, 0 deletions

diff --git a/queue-2.6.32/alsa-hda-cirrus-fix-surround-speaker-volume-control-name.patch b/queue-2.6.32/alsa-hda-cirrus-fix-surround-speaker-volume-control-name.patch
new file mode 100644
index 0000000..b4785e7
--- /dev/null
+++ b/queue-2.6.32/alsa-hda-cirrus-fix-surround-speaker-volume-control-name.patch
@@ -0,0 +1,32 @@
+From 2e1210bc3d065a6e26ff5fef228a9a7e08921d2c Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Wed, 14 Sep 2011 13:22:54 +0200
+Subject: ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit 2e1210bc3d065a6e26ff5fef228a9a7e08921d2c upstream.
+
+This patch fixes "Surround Speaker Playback Volume" being cut off.
+(Commit b4dabfc452a10 was probably meant to fix this, but it fixed
+only the "Switch" name, not the "Volume" name.)
+
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/pci/hda/patch_cirrus.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_cirrus.c
++++ b/sound/pci/hda/patch_cirrus.c
+@@ -509,7 +509,7 @@ static int add_volume(struct hda_codec *
+ 		      int index, unsigned int pval, int dir,
+ 		      struct snd_kcontrol **kctlp)
+ {
+-	char tmp[32];
++	char tmp[44];
+ 	struct snd_kcontrol_new knew =
+ 		HDA_CODEC_VOLUME_IDX(tmp, index, 0, 0, HDA_OUTPUT);
+ 	knew.private_value = pval;
diff --git a/queue-2.6.32/asoc-fix-reporting-of-partial-jack-updates.patch b/queue-2.6.32/asoc-fix-reporting-of-partial-jack-updates.patch
new file mode 100644
index 0000000..584b2a5
--- /dev/null
+++ b/queue-2.6.32/asoc-fix-reporting-of-partial-jack-updates.patch
@@ -0,0 +1,33 @@
+From 747da0f80e566500421bd7760b2e050fea3fde5e Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Sun, 4 Sep 2011 08:18:18 -0700
+Subject: ASoC: Fix reporting of partial jack updates
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+commit 747da0f80e566500421bd7760b2e050fea3fde5e upstream.
+
+We need to report the entire jack state to the core jack code, not just
+the bits that were being updated by the caller, otherwise the status
+reported by other detection methods will be omitted from the state seen
+by userspace.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Acked-by: Liam Girdwood <lrg@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/soc/soc-jack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/soc-jack.c
++++ b/sound/soc/soc-jack.c
+@@ -94,7 +94,7 @@ void snd_soc_jack_report(struct snd_soc_
+ 
+ 	snd_soc_dapm_sync(codec);
+ 
+-	snd_jack_report(jack->jack, status);
++	snd_jack_report(jack->jack, jack->status);
+ 
+ out:
+ 	mutex_unlock(&codec->mutex);
diff --git a/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch b/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
new file mode 100644
index 0000000..c1d4e1e
--- /dev/null
+++ b/queue-2.6.32/drm-radeon-kms-fix-typo-in-r100_blit_copy.patch
@@ -0,0 +1,36 @@
+From 18b4fada275dd2b6dd9db904ddf70fe39e272222 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 16 Sep 2011 12:04:07 -0400
+Subject: drm/radeon/kms: fix typo in r100_blit_copy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit 18b4fada275dd2b6dd9db904ddf70fe39e272222 upstream.
+
+cur_pages is the number of pages per loop iteration.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/radeon/r100.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -355,8 +355,8 @@ int r100_copy_blit(struct radeon_device
+ 		radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
+ 		radeon_ring_write(rdev, 0);
+ 		radeon_ring_write(rdev, (0x1fff) | (0x1fff << 16));
+-		radeon_ring_write(rdev, num_pages);
+-		radeon_ring_write(rdev, num_pages);
++		radeon_ring_write(rdev, cur_pages);
++		radeon_ring_write(rdev, cur_pages);
+ 		radeon_ring_write(rdev, cur_pages | (stride_pixels << 16));
+ 	}
+ 	radeon_ring_write(rdev, PACKET0(RADEON_DSTCACHE_CTLSTAT, 0));
diff --git a/queue-2.6.32/e1000-fix-driver-to-be-used-on-pa-risc-c8000-workstations.patch b/queue-2.6.32/e1000-fix-driver-to-be-used-on-pa-risc-c8000-workstations.patch
new file mode 100644
index 0000000..5edd70f
--- /dev/null
+++ b/queue-2.6.32/e1000-fix-driver-to-be-used-on-pa-risc-c8000-workstations.patch
@@ -0,0 +1,47 @@
+From e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 Mon Sep 17 00:00:00 2001
+From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Date: Tue, 30 Aug 2011 20:58:56 -0400
+Subject: e1000: Fix driver to be used on PA RISC C8000 workstations
+
+From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+
+commit e2faeec2de9e2c73958e6ea6065dde1e8cd6f3a2 upstream.
+
+The checksum field in the EEPROM on HPPA is really not a
+checksum but a signature (0x16d6).  So allow 0x16d6 as the
+matching checksum on HPPA systems.
+
+This issue is present on longterm/stable kernels, I have
+verified that this patch is applicable back to at least
+2.6.32.y kernels.
+
+v2- changed ifdef to use CONFIG_PARISC instead of __hppa__
+
+CC: Guy Martin <gmsoft@tuxicoman.be>
+CC: Rolf Eike Beer <eike-kernel@sf-tec.de>
+CC: Matt Turner <mattst88@gmail.com>
+Reported-by: Mikulas Patocka <mikulas@artax.kerlin.mff.cuni.cz>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/e1000/e1000_hw.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/e1000/e1000_hw.c
++++ b/drivers/net/e1000/e1000_hw.c
+@@ -3842,6 +3842,12 @@ s32 e1000_validate_eeprom_checksum(struc
+ 		checksum += eeprom_data;
+ 	}
+ 
++#ifdef CONFIG_PARISC
++	/* This is a signature and not a checksum on HP c8000 */
++	if ((hw->subsystem_vendor_id == 0x103C) && (eeprom_data == 0x16d6))
++		return E1000_SUCCESS;
++
++#endif
+ 	if (checksum == (u16) EEPROM_SUM)
+ 		return E1000_SUCCESS;
+ 	else {
diff --git a/queue-2.6.32/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch b/queue-2.6.32/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
new file mode 100644
index 0000000..3de98a8
--- /dev/null
+++ b/queue-2.6.32/qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
@@ -0,0 +1,51 @@
+From 58b48576966ed0afd3f63ef17480ec12748a7119 Mon Sep 17 00:00:00 2001
+From: Andrew Vasquez <andrew.vasquez@qlogic.com>
+Date: Tue, 16 Aug 2011 11:29:28 -0700
+Subject: [SCSI] qla2xxx: Correct inadvertent loop state transitions during port-update handling.
+
+From: Andrew Vasquez <andrew.vasquez@qlogic.com>
+
+commit 58b48576966ed0afd3f63ef17480ec12748a7119 upstream.
+
+Transitioning to a LOOP_UPDATE loop-state could cause the driver
+to miss normal link/target processing.  LOOP_UPDATE is a crufty
+artifact leftover from at time the driver performed it's own
+internal command-queuing.  Safely remove this state.
+
+Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
+Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+
+---
+ drivers/scsi/qla2xxx/qla_init.c |    3 ---
+ drivers/scsi/qla2xxx/qla_isr.c  |    1 -
+ 2 files changed, 4 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -3459,15 +3459,12 @@ qla2x00_loop_resync(scsi_qla_host_t *vha
+ 		req = vha->req;
+ 	rsp = req->rsp;
+ 
+-	atomic_set(&vha->loop_state, LOOP_UPDATE);
+ 	clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);
+ 	if (vha->flags.online) {
+ 		if (!(rval = qla2x00_fw_ready(vha))) {
+ 			/* Wait at most MAX_TARGET RSCNs for a stable link. */
+ 			wait_time = 256;
+ 			do {
+-				atomic_set(&vha->loop_state, LOOP_UPDATE);
+-
+ 				/* Issue a marker after FW becomes ready. */
+ 				qla2x00_marker(vha, req, rsp, 0, 0,
+ 					MK_SYNC_ALL);
+--- a/drivers/scsi/qla2xxx/qla_isr.c
++++ b/drivers/scsi/qla2xxx/qla_isr.c
+@@ -717,7 +717,6 @@ skip_rio:
+ 			vha->flags.rscn_queue_overflow = 1;
+ 		}
+ 
+-		atomic_set(&vha->loop_state, LOOP_UPDATE);
+ 		atomic_set(&vha->loop_down_timer, 0);
+ 		vha->flags.management_server_logged_in = 0;
+ 
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index c9a75fa..446500f 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -21,3 +21,8 @@ net-9p-fix-client-code-to-fail-more-gracefully-on-protocol-error.patch
 fs-9p-fid-is-not-valid-after-a-failed-clunk.patch
 net-9p-fix-the-msize-calculation.patch
 irda-fix-smsc-ircc2-section-mismatch-warning.patch
+qla2xxx-correct-inadvertent-loop-state-transitions-during-port-update-handling.patch
+e1000-fix-driver-to-be-used-on-pa-risc-c8000-workstations.patch
+asoc-fix-reporting-of-partial-jack-updates.patch
+alsa-hda-cirrus-fix-surround-speaker-volume-control-name.patch
+drm-radeon-kms-fix-typo-in-r100_blit_copy.patch