diff --git a/[refs] b/[refs] index 4b03d08c31e7..36b29b7246fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d21547d3c9c3bc653261f26d554cfabc4a083de +refs/heads/master: b49f184b640dcfab7ede394cf2a1ff4fe3d154f5 diff --git a/trunk/drivers/video/udlfb.c b/trunk/drivers/video/udlfb.c index cbf030d0dfc4..4330cf4b17a3 100644 --- a/trunk/drivers/video/udlfb.c +++ b/trunk/drivers/video/udlfb.c @@ -1541,7 +1541,7 @@ static int dlfb_parse_vendor_descriptor(struct dlfb_data *dev, u8 length; u16 key; - key = *((u16 *) desc); + key = le16_to_cpu(*((u16 *) desc)); desc += sizeof(u16); length = *desc; desc++;