| Message ID | CAPgLHd-VmhDGxLgx7T7BoTntOhOabG4j07u-fFtB0X3NVwOgyw@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/26/2013 09:00 AM, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > Remove useless NULL test from cyttsp4_watchdog_timer(). > > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > --- > v1 -> v2: remove NULL test instead. > (was: Input: cyttsp4 - fix potential NULL pointer dereference in cyttsp4_watchdog_timer()) > --- > drivers/input/touchscreen/cyttsp4_core.c | 3 --- > 1 file changed, 3 deletions(-) Acked-by: Ferruh Yigit <fery@cypress.com> -- ferruh -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 26, 2013 at 09:28:28AM +0300, Ferruh Yigit wrote: > On 08/26/2013 09:00 AM, Wei Yongjun wrote: > >From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > > >Remove useless NULL test from cyttsp4_watchdog_timer(). > > > >Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > >--- > >v1 -> v2: remove NULL test instead. > > (was: Input: cyttsp4 - fix potential NULL pointer dereference in cyttsp4_watchdog_timer()) > >--- > > drivers/input/touchscreen/cyttsp4_core.c | 3 --- > > 1 file changed, 3 deletions(-) > > Acked-by: Ferruh Yigit <fery@cypress.com> Applied, thank you.
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c index edcf799..22719d0 100644 --- a/drivers/input/touchscreen/cyttsp4_core.c +++ b/drivers/input/touchscreen/cyttsp4_core.c @@ -1246,9 +1246,6 @@ static void cyttsp4_watchdog_timer(unsigned long handle) dev_vdbg(cd->dev, "%s: Watchdog timer triggered\n", __func__); - if (!cd) - return; - if (!work_pending(&cd->watchdog_work)) schedule_work(&cd->watchdog_work);