diff options
author | Dave Airlie <airlied@redhat.com> | 2014-12-11 10:12:57 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-12-11 10:12:57 +1000 |
commit | da9df2f41057d71102668f5ac6b3fc998118a59b (patch) | |
tree | 8061b865d05043cf25263040ef86d4f54549ce25 /drivers/gpu/drm/drm_irq.c | |
parent | Merge branch 'drm-mst-next' of ssh://people.freedesktop.org/~/linux into drm-next (diff) | |
parent | drm: Zero out DRM object memory upon cleanup (diff) | |
download | linux-dev-da9df2f41057d71102668f5ac6b3fc998118a59b.tar.xz linux-dev-da9df2f41057d71102668f5ac6b3fc998118a59b.zip |
Merge tag 'topic/core-stuff-2014-12-10' of git://anongit.freedesktop.org/drm-intel into drm-next
Merge drm core fixes from Daniel.
* tag 'topic/core-stuff-2014-12-10' of git://anongit.freedesktop.org/drm-intel:
drm: Zero out DRM object memory upon cleanup
drm: fix a typo in a comment
drm: fix a word repetition in a comment
drm: Fix memory leak at error path of drm_read()
drm/Documentation: Fix rowspan value in drm-kms-properties
drm/edid: Restore kerneldoc consistency
drm/edid: new drm_edid_block_checksum helper function V3
drm/edid: shorten log output in case of all zeroes edid block
drm/edid: move drm_edid_is_zero to top, make edid argument const
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
-rw-r--r-- | drivers/gpu/drm/drm_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 0e47df4ef24e..f5a5f18efa5b 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -166,7 +166,7 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) spin_lock_irqsave(&dev->vblank_time_lock, irqflags); /* - * If the vblank interrupt was already disbled update the count + * If the vblank interrupt was already disabled update the count * and timestamp to maintain the appearance that the counter * has been ticking all along until this time. This makes the * count account for the entire time between drm_vblank_on() and |