diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-07 14:31:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-07 14:31:14 +1000 |
| commit | 46d987af7649ef9b2f1d1467b9249fb6e24d2658 (patch) | |
| tree | d46ecf4acfb9a84622acaf227d5707d54b34e7fd /drivers | |
| parent | 7bbc1920c0fd1416e4660b1dee5c467a2996c80e (diff) | |
| parent | c7750e8321155d39625c1ffb03227af4fa7f9122 (diff) | |
| download | op-kernel-dev-46d987af7649ef9b2f1d1467b9249fb6e24d2658.zip op-kernel-dev-46d987af7649ef9b2f1d1467b9249fb6e24d2658.tar.gz | |
Merge tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux into drm-next
IPUv3 fixes for v3.18
* tag 'ipu-fixes-3.18' of git://git.pengutronix.de/git/pza/linux:
gpu: ipu-v3: Kconfig: Remove SOC_IMX6SL from IMX_IPUV3_CORE Kconfig
gpu: ipu-v3: ipu-smfc: Do not leave DEBUG defined
gpu: ipu-v3: Return proper error on ipu_add_client_devices error path
gpu: ipu-v3: Select GENERIC_IRQ_CHIP to fix build error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/ipu-v3/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-common.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/ipu-v3/ipu-smfc.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/ipu-v3/Kconfig b/drivers/gpu/ipu-v3/Kconfig index 2f228a2..aefdff9 100644 --- a/drivers/gpu/ipu-v3/Kconfig +++ b/drivers/gpu/ipu-v3/Kconfig @@ -1,7 +1,8 @@ config IMX_IPUV3_CORE tristate "IPUv3 core support" - depends on SOC_IMX5 || SOC_IMX6Q || SOC_IMX6SL || ARCH_MULTIPLATFORM + depends on SOC_IMX5 || SOC_IMX6Q || ARCH_MULTIPLATFORM depends on RESET_CONTROLLER + select GENERIC_IRQ_CHIP help Choose this if you have a i.MX5/6 system and want to use the Image Processing Unit. This option only enables IPU base support. diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index df65d2b..f707d25 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -1060,8 +1060,10 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base) id++, ®->pdata, sizeof(reg->pdata)); } - if (IS_ERR(pdev)) + if (IS_ERR(pdev)) { + ret = PTR_ERR(pdev); goto err_register; + } } return 0; diff --git a/drivers/gpu/ipu-v3/ipu-smfc.c b/drivers/gpu/ipu-v3/ipu-smfc.c index 6ca9b43..4ef9109 100644 --- a/drivers/gpu/ipu-v3/ipu-smfc.c +++ b/drivers/gpu/ipu-v3/ipu-smfc.c @@ -8,7 +8,6 @@ * http://www.opensource.org/licenses/gpl-license.html * http://www.gnu.org/copyleft/gpl.html */ -#define DEBUG #include <linux/export.h> #include <linux/types.h> #include <linux/init.h> |
