2014-01-22 16:03:57

by Andrei Emeltchenko

Subject: [PATCH 1/2] android/ipc: trivial: Remove empty line

From: Andrei Emeltchenko <[email protected]>

---
android/hal-msg.h | 1 -
1 file changed, 1 deletion(-)

diff --git a/android/hal-msg.h b/android/hal-msg.h
index cfb5460..d46b428 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -391,7 +391,6 @@ struct hal_cmd_pan_disconnect {

/* Notifications and confirmations */

-
#define HAL_POWER_OFF 0x00
#define HAL_POWER_ON 0x01

--
1.8.3.2

2014-01-22 16:40:38

by Szymon Janc

Subject: Re: [PATCH 1/2] android/ipc: trivial: Remove empty line

Hi Andrei,

On Wednesday 22 of January 2014 18:03:57 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/hal-msg.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/android/hal-msg.h b/android/hal-msg.h
> index cfb5460..d46b428 100644
> --- a/android/hal-msg.h
> +++ b/android/hal-msg.h
> @@ -391,7 +391,6 @@ struct hal_cmd_pan_disconnect {
>
> /* Notifications and confirmations */
>
> -
> #define HAL_POWER_OFF 0x00
> #define HAL_POWER_ON 0x01
>
>

Both patches applied, thanks.

--
Best regards,
Szymon Janc

2014-01-22 16:03:58

by Andrei Emeltchenko

Subject: [PATCH 2/2] android/pan: Fix possible NULL dereference

From: Andrei Emeltchenko <[email protected]>

It is better to return here since dev is not allocated and assigned NULL
value.
---
android/pan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/pan.c b/android/pan.c
index 4e04da0..adc5df7 100644
--- a/android/pan.c
+++ b/android/pan.c
@@ -439,7 +439,7 @@ static void nap_confirm_cb(GIOChannel *chan, gpointer data)
if (err) {
error("%s", err->message);
g_error_free(err);
- goto failed;
+ return;
}

DBG("incoming connect request from %s", address);
--
1.8.3.2