DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There was probably a race condition when trying to settle with the modem

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-01 03:30:53 +00:00
parent a48cbb2c4c
commit 02833219c9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gsm.c
View File

@ -1705,6 +1705,13 @@ static gboolean _on_reset(gpointer data)
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
gsm->source = 0; gsm->source = 0;
if(gsm->channel != NULL)
{
/* XXX should the file descriptor also be freed? */
g_io_channel_shutdown(gsm->channel, TRUE, &error);
g_io_channel_unref(gsm->channel);
gsm->channel = NULL;
}
if((fd = open(gsm->device, O_RDWR | O_NONBLOCK)) < 0 if((fd = open(gsm->device, O_RDWR | O_NONBLOCK)) < 0
|| _reset_do(fd) != 0) || _reset_do(fd) != 0)
{ {
@ -1863,7 +1870,7 @@ static gboolean _on_watch_can_write(GIOChannel * source, GIOCondition condition,
gsm->wr_source = 0; gsm->wr_source = 0;
if(gsm->mode == GSM_MODE_INIT) if(gsm->mode == GSM_MODE_INIT)
_gsm_queue_pop(gsm); _gsm_queue_pop(gsm);
if(gsm->queue != NULL && (gsmc = gsm->queue->data) != NULL) else if(gsm->queue != NULL && (gsmc = gsm->queue->data) != NULL)
gsm->mode = _gsm_command_get_mode(gsmc); gsm->mode = _gsm_command_get_mode(gsmc);
return FALSE; return FALSE;
} }