From: Greg Kroah-Hartman Date: Sun, 5 Sep 2010 23:37:47 +0000 (-0700) Subject: .35 patches X-Git-Tag: v2.6.27.54~33^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7160f862bd24edd06fb22b75eb813d982f2abab;p=thirdparty%2Fkernel%2Fstable-queue.git .35 patches --- diff --git a/queue-2.6.35/alsa-hda-handle-missing-nid-0x1b-on-alc259-codec.patch b/queue-2.6.35/alsa-hda-handle-missing-nid-0x1b-on-alc259-codec.patch new file mode 100644 index 00000000000..a7f4dd46d21 --- /dev/null +++ b/queue-2.6.35/alsa-hda-handle-missing-nid-0x1b-on-alc259-codec.patch @@ -0,0 +1,31 @@ +From 5d4abf93ea3192cc666430225a29a4978c97c57d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 30 Jul 2010 10:51:10 +0200 +Subject: ALSA: hda - Handle missing NID 0x1b on ALC259 codec + +From: Takashi Iwai + +commit 5d4abf93ea3192cc666430225a29a4978c97c57d upstream. + +Since ALC259/269 use the same parser of ALC268, the pin 0x1b was ignored +as an invalid widget. Just add this NID to handle properly. +This will add the missing mixer controls for some devices. + +Signed-off-by: Takashi Iwai +Cc: David Henningsson +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -13026,6 +13026,7 @@ static int alc268_new_analog_output(stru + dac = 0x02; + break; + case 0x15: ++ case 0x1b: + case 0x21: /* ALC269vb has this pin, too */ + dac = 0x03; + break; diff --git a/queue-2.6.35/alsa-hda-handle-pin-nid-0x1a-on-alc259-269.patch b/queue-2.6.35/alsa-hda-handle-pin-nid-0x1a-on-alc259-269.patch new file mode 100644 index 00000000000..5a6424fe87c --- /dev/null +++ b/queue-2.6.35/alsa-hda-handle-pin-nid-0x1a-on-alc259-269.patch @@ -0,0 +1,32 @@ +From b08b1637ce1c0196970348bcabf40f04b6b3d58e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 30 Jul 2010 14:08:25 +0200 +Subject: ALSA: hda - Handle pin NID 0x1a on ALC259/269 + +From: Takashi Iwai + +commit b08b1637ce1c0196970348bcabf40f04b6b3d58e upstream. + +The pin NID 0x1a should be handled as well as NID 0x1b. +Also added comments. + +Signed-off-by: Takashi Iwai +Cc: David Henningsson +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -13026,7 +13026,8 @@ static int alc268_new_analog_output(stru + dac = 0x02; + break; + case 0x15: +- case 0x1b: ++ case 0x1a: /* ALC259/269 only */ ++ case 0x1b: /* ALC259/269 only */ + case 0x21: /* ALC269vb has this pin, too */ + dac = 0x03; + break; diff --git a/queue-2.6.35/revert-input-appletouch-fix-integer-overflow-issue.patch b/queue-2.6.35/revert-input-appletouch-fix-integer-overflow-issue.patch new file mode 100644 index 00000000000..dc4ff3838b6 --- /dev/null +++ b/queue-2.6.35/revert-input-appletouch-fix-integer-overflow-issue.patch @@ -0,0 +1,47 @@ +From 6e49c1a407c8af8d779a24fd2428857991514a7b Mon Sep 17 00:00:00 2001 +From: Benjamin Herrenschmidt +Date: Mon, 9 Aug 2010 13:48:08 +1000 +Subject: Revert "Input: appletouch - fix integer overflow issue" + +From: Benjamin Herrenschmidt + +commit 6e49c1a407c8af8d779a24fd2428857991514a7b upstream. + +This reverts commit 04b4b88cca0ebe3813b4b6f014fb6a0db380b137. + +While the original problem only caused a slight disturbance on the +edge of the touchpad, the commit above to "fix" it completely breaks +operation on some other models such as mine. + +We'll sort this out separately, revert the patch for now. + +Signed-off-by: Benjamin Herrenschmidt +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/appletouch.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/input/mouse/appletouch.c ++++ b/drivers/input/mouse/appletouch.c +@@ -205,8 +205,8 @@ struct atp { + bool overflow_warned; + int x_old; /* last reported x/y, */ + int y_old; /* used for smoothing */ +- u8 xy_cur[ATP_XSENSORS + ATP_YSENSORS]; +- u8 xy_old[ATP_XSENSORS + ATP_YSENSORS]; ++ signed char xy_cur[ATP_XSENSORS + ATP_YSENSORS]; ++ signed char xy_old[ATP_XSENSORS + ATP_YSENSORS]; + int xy_acc[ATP_XSENSORS + ATP_YSENSORS]; + int idlecount; /* number of empty packets */ + struct work_struct work; +@@ -531,7 +531,7 @@ static void atp_complete_geyser_1_2(stru + + for (i = 0; i < ATP_XSENSORS + ATP_YSENSORS; i++) { + /* accumulate the change */ +- int change = dev->xy_old[i] - dev->xy_cur[i]; ++ signed char change = dev->xy_old[i] - dev->xy_cur[i]; + dev->xy_acc[i] -= change; + + /* prevent down drifting */ diff --git a/queue-2.6.35/series b/queue-2.6.35/series index 1b82ea18907..926c5121bc1 100644 --- a/queue-2.6.35/series +++ b/queue-2.6.35/series @@ -19,3 +19,6 @@ pci-msi-restore-read_msi_msg_desc-add-get_cached_msi_msg_desc.patch direct-io-move-aio_complete-into-end_io.patch ext4-move-aio-completion-after-unwritten-extent-conversion.patch xfs-move-aio-completion-after-unwritten-extent-conversion.patch +revert-input-appletouch-fix-integer-overflow-issue.patch +alsa-hda-handle-missing-nid-0x1b-on-alc259-codec.patch +alsa-hda-handle-pin-nid-0x1a-on-alc259-269.patch