diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:21:25 +0800 |
| commit | 1203868ffa16d93234dc005fba95b6596b87ddb5 (patch) | |
| tree | 0e24f2baa99515d0045998361a2294e2b2b25484 /net/bluetooth/hci_sock.c | |
| parent | 03b862ce80d27a26f8add26a547b3dc7b4d561d6 (diff) | |
| parent | 054f8fe34189a62a0b87700c062a18c3a8421615 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-17.03-androidlsk-v3.18-17.02-android
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -rw-r--r-- | net/bluetooth/hci_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 115f149362ba..1fbc1aadb450 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -46,9 +46,9 @@ struct hci_pinfo { unsigned short channel; }; -static inline int hci_test_bit(int nr, void *addr) +static inline int hci_test_bit(int nr, const void *addr) { - return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); + return *((const __u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); } /* Security filter */ |