summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-04-11 22:27:01 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-04-11 22:32:14 -0400
commit1b0c1c7593a3dd4009feb7473295288f98af2728 (patch)
tree74e151a82b0ae60f4ba64ed8730328dce49c09aa
parent2071c8034fdba6c9cb3c650ab273a9400e79642d (diff)
downloadlongterm-queue-2.6.34-1b0c1c7593a3dd4009feb7473295288f98af2728.tar.gz
staging: clarify changes wrt. upstream for line6 stuff
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/Staging-line6-fix-up-my-fixup-for-some-sysfs-attribu.patch2
-rw-r--r--queue/Staging-line6-fix-up-some-sysfs-attribute-permission.patch3
2 files changed, 5 insertions, 0 deletions
diff --git a/queue/Staging-line6-fix-up-my-fixup-for-some-sysfs-attribu.patch b/queue/Staging-line6-fix-up-my-fixup-for-some-sysfs-attribu.patch
index c4607b4..2c54bed 100644
--- a/queue/Staging-line6-fix-up-my-fixup-for-some-sysfs-attribu.patch
+++ b/queue/Staging-line6-fix-up-my-fixup-for-some-sysfs-attribu.patch
@@ -9,6 +9,8 @@ commit a3a972a053010bfd61c13cfa4ce688d4eebd9a19 upstream
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
+[PG: 34 doesn't have the DEVICE_ATTR chunk in pcm.c so drop that chunk]
+
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
diff --git a/queue/Staging-line6-fix-up-some-sysfs-attribute-permission.patch b/queue/Staging-line6-fix-up-some-sysfs-attribute-permission.patch
index e820be9..2ab6ded 100644
--- a/queue/Staging-line6-fix-up-some-sysfs-attribute-permission.patch
+++ b/queue/Staging-line6-fix-up-some-sysfs-attribute-permission.patch
@@ -7,10 +7,13 @@ commit 2018845b6a169f75341f8e68ad1089cb6697cf24 upstream
They should not be writable by any user
+[PG: 34 doesn't have the DEVICE_ATTR chunk in pcm.c so drop that chunk]
+
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/staging/line6/control.c b/drivers/staging/line6/control.c
index 0b59852..7f7c57b 100644