2014-06-26 21:04:14

by Ravi kumar Veeramally

Subject: [PATCH] android/health: Fix wrong user data passing in set_mcl_cb

It used to be channel, when set_mcl_cb refactored
it got changed to channed->dev.
commit 32180fa3a649ec26f9f3891a0ff5e4fe16592b91 introduced it.
---
android/health.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/health.c b/android/health.c
index 42c9a6e..30a6166 100644
--- a/android/health.c
+++ b/android/health.c
@@ -1341,7 +1341,7 @@ static void create_mcl_cb(struct mcap_mcl *mcl, GError *err, gpointer data)
channel->dev->mcl_conn = true;
info("MCL connected");

- ret = set_mcl_cb(channel->dev->mcl, channel->dev, &gerr);
+ ret = set_mcl_cb(channel->dev->mcl, channel, &gerr);
if (!ret) {
error("health: error setting mdl callbacks: %s", gerr->message);
g_error_free(gerr);
--
1.9.1

2014-06-27 13:31:53

by Szymon Janc

Subject: Re: [PATCH] android/health: Fix wrong user data passing in set_mcl_cb

Hi Ravi,

On Friday 27 of June 2014 00:04:14 Ravi kumar Veeramally wrote:
> It used to be channel, when set_mcl_cb refactored
> it got changed to channed->dev.
> commit 32180fa3a649ec26f9f3891a0ff5e4fe16592b91 introduced it.
> ---
> android/health.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/health.c b/android/health.c
> index 42c9a6e..30a6166 100644
> --- a/android/health.c
> +++ b/android/health.c
> @@ -1341,7 +1341,7 @@ static void create_mcl_cb(struct mcap_mcl *mcl, GError *err, gpointer data)
> channel->dev->mcl_conn = true;
> info("MCL connected");
>
> - ret = set_mcl_cb(channel->dev->mcl, channel->dev, &gerr);
> + ret = set_mcl_cb(channel->dev->mcl, channel, &gerr);
> if (!ret) {
> error("health: error setting mdl callbacks: %s", gerr->message);
> g_error_free(gerr);
>

Applied, thanks.

--
Best regards,
Szymon Janc