Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc2' of github.com:bbrezillon/linux-at91...
authorDave Airlie <airlied@redhat.com>
Fri, 3 Jun 2016 04:08:20 +0000 (14:08 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 3 Jun 2016 04:08:20 +0000 (14:08 +1000)
commit35962eaef44166fd8d4fff7cb4e9c64a2da536ee
treecd158263f67e699b6c3bf6d4f99bfc5a2e467c64
parent6572c8c637278d64dfd355e84a6dcb64b9d6cf28
parent58a2ab3af722550b2e4e8155eb08660e16c20ee6
Merge tag 'drm-atmel-hlcdc-fixes/for-4.7-rc2' of github.com:bbrezillon/linux-at91 into drm-fixes

Two trivial bugfixes for the atmel-hlcdc driver.

The first one is making use of __drm_atomic_helper_crtc_destroy_state()
instead of duplicating its logic in atmel_hlcdc_crtc_reset() and
risking memory leaks if other objects are added to the common CRTC
state.

The second one is fixing a possible NULL pointer dereference.

* tag 'drm-atmel-hlcdc-fixes/for-4.7-rc2' of github.com:bbrezillon/linux-at91:
  drm: atmel-hlcdc: fix a NULL check
  drm: atmel-hlcdc: fix atmel_hlcdc_crtc_reset() implementation