diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-02-11 15:35:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-02-11 15:35:26 +1000 |
| commit | 85840c76d8ad18d978da44e8d2f27bb35b7159af (patch) | |
| tree | c54f837e30c81d4f30aa8eb6c9f6b764734dcd1b /drivers/power/88pm860x_charger.c | |
| parent | 79a44c16b155b799421f5497ae888985a5d7f80c (diff) | |
| parent | a49e7c0d079610062048a4ed1cff2bb09436127c (diff) | |
Merge tag 'imx-drm-fixes-2015-01-28' of git://git.pengutronix.de/git/pza/linux into drm-next
imx-drm fixes for IPUv3 DC and i.MX5 IPUv3 IC and TVE
- Corrected handling of wait_for_completion_timeout return value
when disabling IPUv3 DC channels
- Fixed error return value propagation in TVE mode_set
- Fixed IPUv3 register offsets for IC module on i.MX51 and i.MX53
* tag 'imx-drm-fixes-2015-01-28' of git://git.pengutronix.de/git/pza/linux:
gpu: ipu-v3: Fix IC control register offset
drm: imx: imx-tve: Check and propagate the errors
gpu: ipu-v3: wait_for_completion_timeout does not return negative status
Diffstat (limited to 'drivers/power/88pm860x_charger.c')
0 files changed, 0 insertions, 0 deletions