Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sony-laptop: call sonypi_compat_init earlier

Browse source 
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>
This commit is contained in:
Mattia Dongili 2007-08-12 16:20:27 +09:00 committed by Len Brown
parent f46d1604ed
commit 015a916fbb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/misc/sony-laptop.c
View file

@ -2317,8 +2317,6 @@ static int sony_pic_remove(struct acpi_device *device, int type)
struct sony_pic_ioport *io, *tmp_io; struct sony_pic_ioport *io, *tmp_io;
struct sony_pic_irq *irq, *tmp_irq; struct sony_pic_irq *irq, *tmp_irq;
sonypi_compat_exit();
if (sony_pic_disable(device)) { if (sony_pic_disable(device)) {
printk(KERN_ERR DRV_PFX "Couldn't disable device.\n"); printk(KERN_ERR DRV_PFX "Couldn't disable device.\n");
return -ENXIO; return -ENXIO;
@ -2328,6 +2326,8 @@ static int sony_pic_remove(struct acpi_device *device, int type)
release_region(spic_dev.cur_ioport->io.minimum, release_region(spic_dev.cur_ioport->io.minimum,
spic_dev.cur_ioport->io.address_length); spic_dev.cur_ioport->io.address_length);
sonypi_compat_exit();
sony_laptop_remove_input(); sony_laptop_remove_input();
/* pf attrs */ /* pf attrs */
@ -2393,6 +2393,9 @@ static int sony_pic_add(struct acpi_device *device)
goto err_free_resources; goto err_free_resources;
} }
if (sonypi_compat_init())
goto err_remove_input;
/* request io port */ /* request io port */
list_for_each_entry(io, &spic_dev.ioports, list) { list_for_each_entry(io, &spic_dev.ioports, list) {
if (request_region(io->io.minimum, io->io.address_length, if (request_region(io->io.minimum, io->io.address_length,
@ -2407,7 +2410,7 @@ static int sony_pic_add(struct acpi_device *device)
if (!spic_dev.cur_ioport) { if (!spic_dev.cur_ioport) {
printk(KERN_ERR DRV_PFX "Failed to request_region.\n"); printk(KERN_ERR DRV_PFX "Failed to request_region.\n");
result = -ENODEV; result = -ENODEV;
goto err_remove_input; goto err_remove_compat;
} }
/* request IRQ */ /* request IRQ */
@ -2447,9 +2450,6 @@ static int sony_pic_add(struct acpi_device *device)
if (result) if (result)
goto err_remove_pf; goto err_remove_pf;
if (sonypi_compat_init())
goto err_remove_pf;
return 0; return 0;
err_remove_pf: err_remove_pf:
@ -2465,6 +2465,9 @@ static int sony_pic_add(struct acpi_device *device)
release_region(spic_dev.cur_ioport->io.minimum, release_region(spic_dev.cur_ioport->io.minimum,
spic_dev.cur_ioport->io.address_length); spic_dev.cur_ioport->io.address_length);
err_remove_compat:
sonypi_compat_exit();
err_remove_input: err_remove_input:
sony_laptop_remove_input(); sony_laptop_remove_input();