linux-kernel - [PATCH] backlight: 88pm860x

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1282327315-5259-1-git-send-email-henne@nachtwindheim.de>
Date:	Fri, 20 Aug 2010 20:01:55 +0200
From:	Henrik Kretzschmar <henne@...htwindheim.de>
To:	rpurdie@...ys.net
Cc:	sameo@...ux.intel.com, mjg@...hat.com, henne@...htwindheim.de,
	error27@...il.com, linux-kernel@...r.kernel.org
Subject: [PATCH] backlight: 88pm860x_bl: fix build failure

On x86_64 system this driver fails to build, since theres already a
macro called CURRENT_MASK in arch/asm/include/page_64_types.h
So I renamed this macro to BL_CURRENT_MASK to aviod a collision.

Signed-off-by: Henrik Kretzschmar <henne@...htwindheim.de>
---
This patch is against Linux tree and tested.

 drivers/video/backlight/88pm860x_bl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 38ffc3f..68bd602 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -21,7 +21,7 @@
 #define MAX_BRIGHTNESS		(0xFF)
 #define MIN_BRIGHTNESS		(0)
 
-#define CURRENT_MASK		(0x1F << 1)
+#define BL_CURRENT_MASK		(0x1F << 1)
 
 struct pm860x_backlight_data {
 	struct pm860x_chip *chip;
@@ -85,7 +85,7 @@ static int pm860x_backlight_set(struct backlight_device *bl, int brightness)
 	if ((data->current_brightness == 0) && brightness) {
 		if (data->iset) {
 			ret = pm860x_set_bits(data->i2c, wled_idc(data->port),
-					      CURRENT_MASK, data->iset);
+					      BL_CURRENT_MASK, data->iset);
 			if (ret < 0)
 				goto out;
 		}
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/