Merge "msm: rndis_ipa: continue rndis cleanup although header removal failed" (073af1cb) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/ethernet/msm/rndis_ipa.c

+6 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		*
		* 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
		@@ -1287,10 +1287,10 @@ void rndis_ipa_cleanup(void *private)
		RNDIS_IPA_DEBUG("deregister Tx/Rx properties was successful\n");

		retval = rndis_ipa_hdrs_destroy(rndis_ipa_ctx);
		if (retval) {
		RNDIS_IPA_ERROR("Fail to remove headers\n");
		return;
		}
		if (retval)
		RNDIS_IPA_ERROR(
		"Failed removing RNDIS headers from IPA core. Continue anyway\n");
		else
		RNDIS_IPA_DEBUG("RNDIS headers were removed from IPA core\n");

		rndis_ipa_debugfs_destroy(rndis_ipa_ctx);