From 76dc7e4acdea6a34bdd8dfae6cfe5be07f0550c6 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Fri, 11 Jun 2010 09:17:27 -0500 Subject: [PATCH] atmodem: Shutdown ppp cleanly on remove There is a race condition from udev / kernel when a USB dongle is removed. Sometimes all ports are removed first (and the io channels for those ports are signaled as hupped) while other times the udev remove event fires first. If the latter happens, then gprs_context remove is called with a potentially live ppp object. This patch shuts it down cleanly. --- drivers/atmodem/gprs-context.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c index c7f681d4..4ddf88e7 100644 --- a/drivers/atmodem/gprs-context.c +++ b/drivers/atmodem/gprs-context.c @@ -254,6 +254,13 @@ static void at_gprs_context_remove(struct ofono_gprs_context *gc) { struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc); + DBG(""); + + if (gcd->state != STATE_IDLE) { + g_at_ppp_unref(gcd->ppp); + g_at_chat_resume(gcd->chat); + } + ofono_gprs_context_set_data(gc, NULL); g_free(gcd); }