diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 03:42:59 -0400 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /drivers/gpu/drm/udl/udl_main.c | |
| parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
| parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/udl/udl_main.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index a8d5f09428c7..4c2d836a0893 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c | |||
| @@ -61,7 +61,7 @@ static int udl_parse_vendor_descriptor(struct drm_device *dev, | |||
| 61 | u8 length; | 61 | u8 length; |
| 62 | u16 key; | 62 | u16 key; |
| 63 | 63 | ||
| 64 | key = *((u16 *) desc); | 64 | key = le16_to_cpu(*((u16 *) desc)); |
| 65 | desc += sizeof(u16); | 65 | desc += sizeof(u16); |
| 66 | length = *desc; | 66 | length = *desc; |
| 67 | desc++; | 67 | desc++; |