Merge "platform: msm: msm_bus: Exit module init if misc register fails" (1fdf31db) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/platform/msm/msm_bus/msm-buspm-dev.c

+5 −3

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.		/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -344,8 +344,10 @@ static int __init msm_buspm_dev_init(void)
	int ret = 0;		int ret = 0;

	ret = misc_register(&msm_buspm_misc);		ret = misc_register(&msm_buspm_misc);
	if (ret < 0)		if (ret < 0) {
	pr_err("%s: Cannot register misc device\n", __func__);		WARN_ON(1);
			return ret;
			}

	if (msm_buspm_misc.this_device->coherent_dma_mask == 0)		if (msm_buspm_misc.this_device->coherent_dma_mask == 0)
	msm_buspm_misc.this_device->coherent_dma_mask =		msm_buspm_misc.this_device->coherent_dma_mask =