diff options
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/udl/udl_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 153b9a15469b..1074bc5dd418 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
| @@ -467,7 +467,7 @@ int nouveau_fbcon_init(struct drm_device *dev) | |||
| 467 | nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs; | 467 | nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs; |
| 468 | 468 | ||
| 469 | ret = drm_fb_helper_init(dev, &nfbdev->helper, | 469 | ret = drm_fb_helper_init(dev, &nfbdev->helper, |
| 470 | nv_two_heads(dev) ? 2 : 1, 4); | 470 | dev->mode_config.num_crtc, 4); |
| 471 | if (ret) { | 471 | if (ret) { |
| 472 | kfree(nfbdev); | 472 | kfree(nfbdev); |
| 473 | return ret; | 473 | return ret; |
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++; |
