rk29_key: del adc timer if probe failed
authorkfx <kfx@rock-chips.com>
Sat, 1 Sep 2012 09:07:53 +0000 (17:07 +0800)
committerkfx <kfx@rock-chips.com>
Sat, 1 Sep 2012 09:07:53 +0000 (17:07 +0800)
drivers/input/keyboard/rk29_keys.c

index 711388cd3b18f3cb9cd71faf9236e04685c2d186..16b56198709ffdca073b0bdbe096cabbd04282ae 100755 (executable)
@@ -425,6 +425,8 @@ static int __devinit keys_probe(struct platform_device *pdev)
        }
        if(pdata->chn >= 0 && ddata->client);
                adc_unregister(ddata->client);
+       if(pdata->chn >= 0)
+               del_timer_sync(&ddata->timer);
  fail1:
        platform_set_drvdata(pdev, NULL);
  fail0: