armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

sensors:fix lightsensor ioctl logic error

Browse Source
This commit is contained in:
luowei
2012-10-11 14:34:47 +08:00
parent 901c0ecbc5
commit f306c95b33
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/input/sensors/sensor-dev.c
View File

@@ -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);