diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-29 15:26:07 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-29 15:26:07 -0400 |
| commit | e470f3a2429667c75b938e10f2b1cf5371b5b24c (patch) | |
| tree | fb68fd25b7945c6ed5dd80ea3a4abafd61ee0221 /drivers/gpu/drm/bridge | |
| parent | a1f5524a66ff6284d1380cdd7723de82698ff9d3 (diff) | |
| parent | 12ae57aab43880eac500c43590e26d9d4411961b (diff) | |
Merge tag 'topic/drm-misc-2016-07-28' of git://anongit.freedesktop.org/drm-intel into drm-next
A few more simple fixes that Sean&I collected. There's a bunch of bigger
things on dri-devel, but I think those are all too late for 4.8 really.
I'll try and go collect them after -rc1 for 4.9.
* tag 'topic/drm-misc-2016-07-28' of git://anongit.freedesktop.org/drm-intel:
drm/arm: mali-dp: Fix error return code in malidp_bind()
drm/arm: mali-dp: Remove redundant dev_err call in malidp_bind()
drm/gma500: remove unnecessary stub for fb_ioctl()
apple-gmux: Sphinxify docs
drm/arm: mali-dp: Set crtc.port to the port instead of the endpoint
drm/sti: use new Reset API
drm/etnaviv: Optimize error handling in etnaviv_gem_new_userptr()
drm/etnaviv: Delete unnecessary checks before two function calls
drm/vmwgfx: Delete an unnecessary check before the function call "vfree"
drm/qxl: Delete an unnecessary check before drm_gem_object_unreference_unlocked()
drm/mgag200: Delete an unnecessary check before drm_gem_object_unreference_unlocked()
drm/bridge: ps8622: Delete an unnecessary check before backlight_device_unregister()
GPU-DRM-GMA500: Delete unnecessary checks before two function calls
GPU-DRM-OMAP: Delete unnecessary checks before two function calls
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/parade-ps8622.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 5cd8dd7e5904..583b8ce614e3 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c | |||
| @@ -636,9 +636,7 @@ static int ps8622_remove(struct i2c_client *client) | |||
| 636 | { | 636 | { |
| 637 | struct ps8622_bridge *ps8622 = i2c_get_clientdata(client); | 637 | struct ps8622_bridge *ps8622 = i2c_get_clientdata(client); |
| 638 | 638 | ||
| 639 | if (ps8622->bl) | 639 | backlight_device_unregister(ps8622->bl); |
| 640 | backlight_device_unregister(ps8622->bl); | ||
| 641 | |||
| 642 | drm_bridge_remove(&ps8622->bridge); | 640 | drm_bridge_remove(&ps8622->bridge); |
| 643 | 641 | ||
| 644 | return 0; | 642 | return 0; |
