From bbd7573ba29068d27eb37cd0d8b03a857ede7f7c Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Sat, 13 Apr 2013 20:16:51 +0530 Subject: [PATCH] --- yaml --- r: 364142 b: refs/heads/master c: c0352cb71d3d573a33af92d320f29f1c79d71b8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/gdm72xx/gdm_sdio.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f06009114a1a..e4513f167ca2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bb590b80b2f057d9277adc86a0858843d15fca6 +refs/heads/master: c0352cb71d3d573a33af92d320f29f1c79d71b8b diff --git a/trunk/drivers/staging/gdm72xx/gdm_sdio.c b/trunk/drivers/staging/gdm72xx/gdm_sdio.c index 695762b0e942..047a4d77f5ee 100644 --- a/trunk/drivers/staging/gdm72xx/gdm_sdio.c +++ b/trunk/drivers/staging/gdm72xx/gdm_sdio.c @@ -689,6 +689,7 @@ static void sdio_wimax_remove(struct sdio_func *func) struct phy_dev *phy_dev = sdio_get_drvdata(func); struct sdiowm_dev *sdev = phy_dev->priv_dev; + cancel_work_sync(&sdev->ws); if (phy_dev->netdev) unregister_wimax_device(phy_dev); sdio_claim_host(func);