Merge "msm: ipa: fix bug in assign_policy" (19ad2db1) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/include/mach/ipa.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1015,6 +1015,7 @@ int ipa_add_interrupt_handler(enum ipa_irq_type interrupt,
		void *private_data);
		int ipa_remove_interrupt_handler(enum ipa_irq_type interrupt);

		int ipa_get_ep_mapping(enum ipa_client_type client);

		#else /* CONFIG_IPA */

		@@ -1547,6 +1548,11 @@ static inline int ipa_remove_interrupt_handler(enum ipa_irq_type interrupt)
		{
		return -EPERM;
		}

		static inline int ipa_get_ep_mapping(enum ipa_client_type client)
		{
		return -EPERM;
		}
		#endif /* CONFIG_IPA*/

		#endif /* _IPA_H_ */

+1 −1

Original line number	Diff line number	Diff line
		@@ -944,13 +944,13 @@ int ipa_setup_sys_pipe(struct ipa_sys_connect_params sys_in, u32 clnt_hdl)
		}

		ep->sys->ep = ep;
		ep->skip_ep_cfg = sys_in->skip_ep_cfg;
		if (ipa_assign_policy(sys_in, ep->sys)) {
		IPAERR("failed to sys ctx for client %d\n", sys_in->client);
		result = -ENOMEM;
		goto fail_gen2;
		}

		ep->skip_ep_cfg = sys_in->skip_ep_cfg;
		ep->valid = 1;
		ep->client = sys_in->client;
		ep->client_notify = sys_in->notify;

+1 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,7 @@ int ipa_get_ep_mapping(enum ipa_client_type client)

		return ep_mapping[hw_type_index][client];
		}
		EXPORT_SYMBOL(ipa_get_ep_mapping);

		/**
		* ipa_get_client_mapping() - provide client mapping