LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6.22.y] {09/17} - sony-laptop-call-sonypi_compat_init-earlier - series for stable kernel #2
@ 2008-02-02  1:34 Oliver Pinter (Pintér Olivér)
  2008-02-06 23:06 ` Oliver Pinter
  0 siblings, 1 reply; 2+ messages in thread
From: Oliver Pinter (Pintér Olivér) @ 2008-02-02  1:34 UTC (permalink / raw)
  To: Linux Kernel, stable, stable-commits
  Cc: chrisw, Greg KH, Willy Tarreau, Adrian Bunk, Mattia Dongili,
	Len Brown, Jeff Mahoney

[-- Attachment #1: Type: text/plain, Size: 72 bytes --]

mainline: 015a916fbbf105bb15f4bbfd80c3b9b2f2e0d7db


-- 
Thanks,
Oliver

[-- Attachment #2: sony-laptop-call-sonypi_compat_init-earlier --]
[-- Type: message/rfc822, Size: 2172 bytes --]



ZyAyMDA3IDA3OjIwOjI3ICswMDAwICgrMDkwMCkKU3ViamVjdDogc29ueS1sYXB0b3A6IGNhbGwg
c29ueXBpX2NvbXBhdF9pbml0IGVhcmxpZXIKUGF0Y2gtbWFpbmxpbmU6IDIuNi4yMwpSZWZlcmVu
Y2VzOiAzNTA5ODQKCnNvbnktbGFwdG9wOiBjYWxsIHNvbnlwaV9jb21wYXRfaW5pdCBlYXJsaWVy
Cgpzb255cGlfY29tcGF0IHVzZXMgYSBrZmlmbyB0aGF0IG5lZWRzIHRvIGJlIHByZXNlbnQgYmVm
b3JlIF9TUlMgaXMKY2FsbGVkIHRvIGJlIGFibGUgdG8gY29wZSB3aXRoIHRoZSBJUlFzIHRyaWdn
ZXJlZCB3aGVuIHNldHRpbmcKcmVzb3VyY2VzLgoKU2lnbmVkLW9mZi1ieTogTWF0dGlhIERvbmdp
bGkgPG1hbGF0dGlhQGxpbnV4Lml0PgpTaWduZWQtb2ZmLWJ5OiBMZW4gQnJvd24gPGxlbi5icm93
bkBpbnRlbC5jb20+CkFja2VkLWJ5OiBKZWZmIE1haG9uZXkgPGplZmZtQHN1c2UuY29tPgotLS0K
IGRyaXZlcnMvbWlzYy9zb255LWxhcHRvcC5jIHwgICAxNSArKysrKysrKystLS0tLS0KIDEgZmls
ZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgotLS0gYS9kcml2ZXJz
L21pc2Mvc29ueS1sYXB0b3AuYwkyMDA3LTExLTI4IDEwOjUyOjEzLjAwMDAwMDAwMCAtMDUwMAor
KysgYi9kcml2ZXJzL21pc2Mvc29ueS1sYXB0b3AuYwkyMDA4LTAxLTAyIDE1OjE3OjQyLjAwMDAw
MDAwMCAtMDUwMApAQCAtMjA2OCw4ICsyMDY4LDYgQEAgc3RhdGljIGludCBzb255X3BpY19yZW1v
dmUoc3RydWN0IGFjcGlfZAogCXN0cnVjdCBzb255X3BpY19pb3BvcnQgKmlvLCAqdG1wX2lvOwog
CXN0cnVjdCBzb255X3BpY19pcnEgKmlycSwgKnRtcF9pcnE7CiAKLQlzb255cGlfY29tcGF0X2V4
aXQoKTsKLQogCWlmIChzb255X3BpY19kaXNhYmxlKGRldmljZSkpIHsKIAkJcHJpbnRrKEtFUk5f
RVJSIERSVl9QRlggIkNvdWxkbid0IGRpc2FibGUgZGV2aWNlLlxuIik7CiAJCXJldHVybiAtRU5Y
SU87CkBAIC0yMDc5LDYgKzIwNzcsOCBAQCBzdGF0aWMgaW50IHNvbnlfcGljX3JlbW92ZShzdHJ1
Y3QgYWNwaV9kCiAJcmVsZWFzZV9yZWdpb24oc3BpY19kZXYuY3VyX2lvcG9ydC0+aW8ubWluaW11
bSwKIAkJCXNwaWNfZGV2LmN1cl9pb3BvcnQtPmlvLmFkZHJlc3NfbGVuZ3RoKTsKIAorCXNvbnlw
aV9jb21wYXRfZXhpdCgpOworCiAJc29ueV9sYXB0b3BfcmVtb3ZlX2lucHV0KCk7CiAKIAkvKiBw
ZiBhdHRycyAqLwpAQCAtMjE0NCw2ICsyMTQ0LDkgQEAgc3RhdGljIGludCBzb255X3BpY19hZGQo
c3RydWN0IGFjcGlfZGV2aQogCQlnb3RvIGVycl9mcmVlX3Jlc291cmNlczsKIAl9CiAKKwlpZiAo
c29ueXBpX2NvbXBhdF9pbml0KCkpCisJCWdvdG8gZXJyX3JlbW92ZV9pbnB1dDsKKwogCS8qIHJl
cXVlc3QgaW8gcG9ydCAqLwogCWxpc3RfZm9yX2VhY2hfZW50cnkoaW8sICZzcGljX2Rldi5pb3Bv
cnRzLCBsaXN0KSB7CiAJCWlmIChyZXF1ZXN0X3JlZ2lvbihpby0+aW8ubWluaW11bSwgaW8tPmlv
LmFkZHJlc3NfbGVuZ3RoLApAQCAtMjE1OCw3ICsyMTYxLDcgQEAgc3RhdGljIGludCBzb255X3Bp
Y19hZGQoc3RydWN0IGFjcGlfZGV2aQogCWlmICghc3BpY19kZXYuY3VyX2lvcG9ydCkgewogCQlw
cmludGsoS0VSTl9FUlIgRFJWX1BGWCAiRmFpbGVkIHRvIHJlcXVlc3RfcmVnaW9uLlxuIik7CiAJ
CXJlc3VsdCA9IC1FTk9ERVY7Ci0JCWdvdG8gZXJyX3JlbW92ZV9pbnB1dDsKKwkJZ290byBlcnJf
cmVtb3ZlX2NvbXBhdDsKIAl9CiAKIAkvKiByZXF1ZXN0IElSUSAqLwpAQCAtMjE5OCw5ICsyMjAx
LDYgQEAgc3RhdGljIGludCBzb255X3BpY19hZGQoc3RydWN0IGFjcGlfZGV2aQogCWlmIChyZXN1
bHQpCiAJCWdvdG8gZXJyX3JlbW92ZV9wZjsKIAotCWlmIChzb255cGlfY29tcGF0X2luaXQoKSkK
LQkJZ290byBlcnJfcmVtb3ZlX3BmOwotCiAJcmV0dXJuIDA7CiAKIGVycl9yZW1vdmVfcGY6CkBA
IC0yMjE2LDYgKzIyMTYsOSBAQCBlcnJfcmVsZWFzZV9yZWdpb246CiAJcmVsZWFzZV9yZWdpb24o
c3BpY19kZXYuY3VyX2lvcG9ydC0+aW8ubWluaW11bSwKIAkJCXNwaWNfZGV2LmN1cl9pb3BvcnQt
PmlvLmFkZHJlc3NfbGVuZ3RoKTsKIAorZXJyX3JlbW92ZV9jb21wYXQ6CisJc29ueXBpX2NvbXBh
dF9leGl0KCk7CisKIGVycl9yZW1vdmVfaW5wdXQ6CiAJc29ueV9sYXB0b3BfcmVtb3ZlX2lucHV0
KCk7CiAK

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [2.6.22.y] {09/17} - sony-laptop-call-sonypi_compat_init-earlier - series for stable kernel #2
  2008-02-02  1:34 [2.6.22.y] {09/17} - sony-laptop-call-sonypi_compat_init-earlier - series for stable kernel #2 Oliver Pinter (Pintér Olivér)
@ 2008-02-06 23:06 ` Oliver Pinter
  0 siblings, 0 replies; 2+ messages in thread
From: Oliver Pinter @ 2008-02-06 23:06 UTC (permalink / raw)
  To: Linux Kernel, stable, stable-commits

From: Mattia Dongili <malattia@linux.it>
Date: Sun, 12 Aug 2007 07:20:27 +0000 (+0900)
Subject: sony-laptop: call sonypi_compat_init earlier
Patch-mainline: 2.6.23
References: 350984

sony-laptop: call sonypi_compat_init earlier

sonypi_compat uses a kfifo that needs to be present before _SRS is
called to be able to cope with the IRQs triggered when setting
resources.

Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
 drivers/misc/sony-laptop.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- a/drivers/misc/sony-laptop.c	2007-11-28 10:52:13.000000000 -0500
+++ b/drivers/misc/sony-laptop.c	2008-01-02 15:17:42.000000000 -0500
@@ -2068,8 +2068,6 @@ static int sony_pic_remove(struct acpi_d
 	struct sony_pic_ioport *io, *tmp_io;
 	struct sony_pic_irq *irq, *tmp_irq;

-	sonypi_compat_exit();
-
 	if (sony_pic_disable(device)) {
 		printk(KERN_ERR DRV_PFX "Couldn't disable device.\n");
 		return -ENXIO;
@@ -2079,6 +2077,8 @@ static int sony_pic_remove(struct acpi_d
 	release_region(spic_dev.cur_ioport->io.minimum,
 			spic_dev.cur_ioport->io.address_length);

+	sonypi_compat_exit();
+
 	sony_laptop_remove_input();

 	/* pf attrs */
@@ -2144,6 +2144,9 @@ static int sony_pic_add(struct acpi_devi
 		goto err_free_resources;
 	}

+	if (sonypi_compat_init())
+		goto err_remove_input;
+
 	/* request io port */
 	list_for_each_entry(io, &spic_dev.ioports, list) {
 		if (request_region(io->io.minimum, io->io.address_length,
@@ -2158,7 +2161,7 @@ static int sony_pic_add(struct acpi_devi
 	if (!spic_dev.cur_ioport) {
 		printk(KERN_ERR DRV_PFX "Failed to request_region.\n");
 		result = -ENODEV;
-		goto err_remove_input;
+		goto err_remove_compat;
 	}

 	/* request IRQ */
@@ -2198,9 +2201,6 @@ static int sony_pic_add(struct acpi_devi
 	if (result)
 		goto err_remove_pf;

-	if (sonypi_compat_init())
-		goto err_remove_pf;
-
 	return 0;

 err_remove_pf:
@@ -2216,6 +2216,9 @@ err_release_region:
 	release_region(spic_dev.cur_ioport->io.minimum,
 			spic_dev.cur_ioport->io.address_length);

+err_remove_compat:
+	sonypi_compat_exit();
+
 err_remove_input:
 	sony_laptop_remove_input();



On 2/2/08, Oliver Pinter (Pintér Olivér) <oliver.pntr@gmail.com> wrote:
> mainline: 015a916fbbf105bb15f4bbfd80c3b9b2f2e0d7db
>
>
> --
> Thanks,
> Oliver
>


-- 
Thanks,
Oliver

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-02-06 23:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-02  1:34 [2.6.22.y] {09/17} - sony-laptop-call-sonypi_compat_init-earlier - series for stable kernel #2 Oliver Pinter (Pintér Olivér)
2008-02-06 23:06 ` Oliver Pinter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).