aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sony-laptop.c
diff options
context:
space:
mode:
authormalattia@linux.it <malattia@linux.it>2007-04-28 10:34:10 -0400
committerLen Brown <len.brown@intel.com>2007-04-28 22:05:59 -0400
commit1a3e323907dc5991cba2d715d5db3ae2eac78280 (patch)
tree28e26b035b0a03f66415f9d80dfb86a9700cb1d5 /drivers/misc/sony-laptop.c
parent74a882e4857414a98ca5904b3be90fb6aba2f25e (diff)
sonypi: try to detect if sony-laptop has already taken one of the known ioports
Get the IO resources list in sony-laptop in the same order as listed in sonypi and make sonypi check if one of those is already busy. The sonypi check can be disabled by a module parameter in case the user thinks we are plainly wrong (check_ioport=0). Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r--drivers/misc/sony-laptop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 141284dee1a1..2787e1ce8911 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1801,7 +1801,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
1801 if (!interrupt) 1801 if (!interrupt)
1802 return AE_ERROR; 1802 return AE_ERROR;
1803 1803
1804 list_add(&interrupt->list, &dev->interrupts); 1804 list_add_tail(&interrupt->list, &dev->interrupts);
1805 interrupt->irq.triggering = p->triggering; 1805 interrupt->irq.triggering = p->triggering;
1806 interrupt->irq.polarity = p->polarity; 1806 interrupt->irq.polarity = p->polarity;
1807 interrupt->irq.sharable = p->sharable; 1807 interrupt->irq.sharable = p->sharable;
@@ -1823,7 +1823,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
1823 if (!ioport) 1823 if (!ioport)
1824 return AE_ERROR; 1824 return AE_ERROR;
1825 1825
1826 list_add(&ioport->list, &dev->ioports); 1826 list_add_tail(&ioport->list, &dev->ioports);
1827 memcpy(&ioport->io, io, sizeof(*io)); 1827 memcpy(&ioport->io, io, sizeof(*io));
1828 return AE_OK; 1828 return AE_OK;
1829 } 1829 }