summaryrefslogtreecommitdiffstats
path: root/arch/3.5.13/trinity-base/hal/patches/macbook-fix-ioperm.patch
blob: 14d0b392db836fd7661b15529969d081ddfd9837 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 25 Feb 2010 10:25:18 +0000
Subject: Fix incorrect arguments to ioperm() call

The second argument of ioperm() is not the last port to be accessed
but rather length of the port range [port, port + len).

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
---
diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c
index e869192..54e4ea3 100644
--- a/hald/linux/addons/addon-imac-backlight.c
+++ b/hald/linux/addons/addon-imac-backlight.c
@@ -158,7 +158,8 @@ main (int argc, char **argv)
 		goto out;
 	}
 
-	if (ioperm(0xB2, 0xB3, 1) < 0)
+	/* Allow access to ports 0xB2 and 0xB3 */
+	if (ioperm(0xB2, 2, 1) < 0)
 	{
 		HAL_ERROR (("ioperm failed (you should be root)."));
 		exit(1);
diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
index 2a6fef6..c1bbbac 100644
--- a/hald/linux/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
@@ -507,7 +507,8 @@ main (int argc, char *argv[])
  	state = INREG(0x7ae4);
  	OUTREG(0x7ae4, state);
 
-	if (ioperm (0x300, 0x304, 1) < 0) {
+	/* Allow access to porta 0x300 through 0x304 */
+	if (ioperm (0x300, 5, 1) < 0) {
 		HAL_ERROR (("ioperm failed (you should be root)."));
 		exit(1);
 	}
--
cgit v0.8.3-6-g21f6