Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes (8a211d36) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/mach-mmp/sram.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,7 @@ static int __devinit sram_probe(struct platform_device *pdev)
	struct resource *res;		struct resource *res;
	int ret = 0;		int ret = 0;

	if (!pdata && !pdata->pool_name)		if (!pdata \|\| !pdata->pool_name)
	return -ENODEV;		return -ENODEV;

	info = kzalloc(sizeof(*info), GFP_KERNEL);		info = kzalloc(sizeof(*info), GFP_KERNEL);