From 19b5efc66be1b83986c06cfc2211b767b6f8a408 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 3 Jan 2011 08:47:40 +0300 Subject: [PATCH] --- yaml --- r: 235653 b: refs/heads/master c: b01627c608d97b5246eb7a4b75c40f2a1fb4dc30 h: refs/heads/master i: 235651: 0faa8f5a2b34cf360ad0c8f37cf9b47b073a2739 v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000-input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8da715de953a..46529b4de705 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa96646daa15d6ac05addc7db7272dd5787c6953 +refs/heads/master: b01627c608d97b5246eb7a4b75c40f2a1fb4dc30 diff --git a/trunk/drivers/staging/tm6000/tm6000-input.c b/trunk/drivers/staging/tm6000/tm6000-input.c index 21e7da40f049..01fcbbe38409 100644 --- a/trunk/drivers/staging/tm6000/tm6000-input.c +++ b/trunk/drivers/staging/tm6000/tm6000-input.c @@ -374,7 +374,7 @@ int tm6000_ir_init(struct tm6000_core *dev) ir = kzalloc(sizeof(*ir), GFP_KERNEL); rc = rc_allocate_device(); - if (!ir | !rc) + if (!ir || !rc) goto out; /* record handles to ourself */