Commit 57e36159 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.16-drivers' of...

Merge tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers

drivers for 4.16

 - use PTR_ERR_OR_ZERO were relevant in at91_cf

* tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  pcmcia: at91_cf: Use PTR_ERR_OR_ZERO()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 11077e9b 12038392
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -236,10 +236,8 @@ static int at91_cf_dt_init(struct platform_device *pdev)
	pdev->dev.platform_data = board;

	mc = syscon_regmap_lookup_by_compatible("atmel,at91rm9200-sdramc");
	if (IS_ERR(mc))
		return PTR_ERR(mc);

	return 0;
	return PTR_ERR_OR_ZERO(mc);
}
#else
static int at91_cf_dt_init(struct platform_device *pdev)