Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c105068f authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

hid-core: use get_unaligned_* helpers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f885f8d1

drivers/hid/hid-core.c

+3 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item) 
		case 2:

			if ((end - start) < 2)

				return NULL;

			item->data.u16 = le16_to_cpu(get_unaligned((__le16*)start));

			item->data.u16 = get_unaligned_le16(start);

			start = (__u8 *)((__le16 *)start + 1);

			return start;
@@ -614,7 +614,7 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item) 
			item->size++;

			if ((end - start) < 4)

				return NULL;

			item->data.u32 = le32_to_cpu(get_unaligned((__le32*)start));

			item->data.u32 = get_unaligned_le32(start);

			start = (__u8 *)((__le32 *)start + 1);

			return start;

	}
@@ -765,7 +765,7 @@ static __inline__ __u32 extract(__u8 *report, unsigned offset, unsigned n) 


	report += offset >> 3;  /* adjust byte index */

	offset &= 7;            /* now only need bit offset into one byte */

	x = le64_to_cpu(get_unaligned((__le64 *) report));

	x = get_unaligned_le64(report);

	x = (x >> offset) & ((1ULL << n) - 1);  /* extract bit field */

	return (u32) x;

}