diff options
| author | David S. Miller | 2009-07-10 05:18:24 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-07-10 05:18:24 +0200 |
| commit | e5a8a896f5180f2950695d2d0b79db348d200ca4 (patch) | |
| tree | 04adc57ae51a6d30a89ffae970770b81ee81fc23 /drivers/platform/x86 | |
| parent | netpoll: Introduce netpoll_carrier_timeout kernel option (diff) | |
| parent | cxgb3: Fix crash caused by stashing wrong netdev_queue (diff) | |
| download | kernel-qcow2-linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.gz kernel-qcow2-linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.tar.xz kernel-qcow2-linux-e5a8a896f5180f2950695d2d0b79db348d200ca4.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 4ac2311c00af..ca508564a181 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -171,7 +171,7 @@ static int hp_wmi_tablet_state(void) static int hp_wmi_set_block(void *data, bool blocked) { unsigned long b = (unsigned long) data; - int query = BIT(b + 8) | ((!!blocked) << b); + int query = BIT(b + 8) | ((!blocked) << b); return hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 1, query); } |