From: luowei <lw@rock-chips.com>
Date: Thu, 11 Oct 2012 06:34:47 +0000 (+0800)
Subject: sensors:fix lightsensor ioctl logic error
X-Git-Tag: firefly_0821_release~8442
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f306c95b33bc0e15410d6b91c310037ca67cbdd7;p=firefly-linux-kernel-4.4.55.git

sensors:fix lightsensor ioctl logic error
---

diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c
index a3050cbac4d8..d43432301627 100755
--- a/drivers/input/sensors/sensor-dev.c
+++ b/drivers/input/sensors/sensor-dev.c
@@ -779,10 +779,13 @@ static long light_dev_ioctl(struct file *file,
 					printk("%s:fail to active sensor,ret=%d\n",__func__,result);         
 					goto error;           
 		            		}	
-					if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))
+					if(sensor->pdata->irq_enable)
 					{
-						DBG("%s:enable irq,irq=%d\n",__func__,client->irq);
-						enable_irq(client->irq);	//enable irq
+						if(!(sensor->ops->trig & IRQF_SHARED))
+						{
+							DBG("%s:enable irq,irq=%d\n",__func__,client->irq);
+							enable_irq(client->irq);	//enable irq
+						}
 					}	
 					else
 					{
@@ -802,10 +805,13 @@ static long light_dev_ioctl(struct file *file,
 					goto error;
 		            		}
 					
-					if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))
+					if(sensor->pdata->irq_enable)
 					{				
-						DBG("%s:disable irq,irq=%d\n",__func__,client->irq);
-						disable_irq_nosync(client->irq);//disable irq
+						if(!(sensor->ops->trig & IRQF_SHARED))
+						{
+							DBG("%s:disable irq,irq=%d\n",__func__,client->irq);
+							disable_irq_nosync(client->irq);//disable irq
+						}
 					}
 					else
 					cancel_delayed_work_sync(&sensor->delaywork);	
@@ -874,10 +880,13 @@ static long proximity_dev_ioctl(struct file *file,
 					goto error;           
 					}
 					
-					if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))
+					if(sensor->pdata->irq_enable)
 					{
-						DBG("%s:enable irq,irq=%d\n",__func__,client->irq);
-						enable_irq(client->irq);	//enable irq
+						if(!(sensor->ops->trig & IRQF_SHARED))
+						{
+							DBG("%s:enable irq,irq=%d\n",__func__,client->irq);
+							enable_irq(client->irq);	//enable irq
+						}
 					}	
 					else
 					{
@@ -896,10 +905,13 @@ static long proximity_dev_ioctl(struct file *file,
 		                	mutex_unlock(&sensor->operation_mutex);              
 					goto error;
 					}
-					if(sensor->pdata->irq_enable && (!(sensor->ops->trig & IRQF_SHARED)))
+					if(sensor->pdata->irq_enable)
 					{				
-						DBG("%s:disable irq,irq=%d\n",__func__,client->irq);
-						disable_irq_nosync(client->irq);//disable irq
+						if(!(sensor->ops->trig & IRQF_SHARED))
+						{
+							DBG("%s:disable irq,irq=%d\n",__func__,client->irq);
+							disable_irq_nosync(client->irq);//disable irq
+						}
 					}
 					else
 					cancel_delayed_work_sync(&sensor->delaywork);