Re: [PATCH obexd 1/1] Fix OPP not sending TransferCompleted signal

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Slawomir,

On Fri, Oct 7, 2011 at 12:11 PM, Slawomir Bochenski <lkslawek@xxxxxxxxx> wrote:
> Commit 934b3b2f5f8432b67822be9f83a141fe3783cbd7 introduced a regression
> in OPP, by making it not send TransferCompleted signal. This happened
> because OPP was calling manager_emit_transfer_completed() on .reset(),
> and manager_emit_transfer_completed() in turn checks if the os->object
> is not NULL. This fixes this by moving clearing os->object after doing
> service driver .reset().
> ---
>  src/obex.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/obex.c b/src/obex.c
> index 59bbe7a..a0c17c1 100644
> --- a/src/obex.c
> +++ b/src/obex.c
> @@ -288,8 +288,6 @@ static void os_reset_session(struct obex_session *os)
>        if (os->object) {
>                os->driver->set_io_watch(os->object, NULL, NULL);
>                os->driver->close(os->object);
> -               os->object = NULL;
> -               os->obj = NULL;
>                if (os->aborted && os->cmd == OBEX_CMD_PUT && os->path &&
>                                os->driver->remove)
>                        os->driver->remove(os->path);
> @@ -315,6 +313,8 @@ static void os_reset_session(struct obex_session *os)
>                os->path = NULL;
>        }
>
> +       os->object = NULL;
> +       os->obj = NULL;
>        os->driver = NULL;
>        os->aborted = FALSE;
>        os->pending = 0;
> --
> 1.7.4.1

Ack.

-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux