github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-09 23:23:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

modify psensor for phonesdk

Browse Source
This commit is contained in:
lyx 2011-04-22 20:06:04 -07:00
parent 4431b3de6d
commit e617e947da
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/misc/isl29028.c
View File

@ -64,8 +64,8 @@
#define ISL_REG_PROX_LT (0x03)
#define ISL_REG_PROX_HT (0x04)
#define PROX_LT (0xe0)
#define PROX_HT (0xf0)
#define PROX_LT (0x90)
#define PROX_HT (0xA0)
#define ISL_REG_PROX_DATA (0x08)
#define ISL_REG_ALSIR_LDATA (0x09)
@ -205,7 +205,7 @@ static int isl29028_psensor_enable(struct i2c_client *client)
#endif
mutex_unlock(&isl->lock);
enable_irq(isl->irq);
//enable_irq(isl->irq);
return ret;
}
@ -215,9 +215,6 @@ static int isl29028_psensor_disable(struct i2c_client *client)
char ret, reg, reg2, value, value2;
struct isl29028_data *isl = (struct isl29028_data *)i2c_get_clientdata(client);
disable_irq(isl->irq);
cancel_delayed_work_sync(&isl->p_work);
mutex_lock(&isl->lock);
reg = ISL_REG_CONFIG;
@ -238,6 +235,10 @@ static int isl29028_psensor_disable(struct i2c_client *client)
#endif
mutex_unlock(&isl->lock);
disable_irq(isl->irq);
cancel_delayed_work_sync(&isl->p_work);
enable_irq(isl->irq);
return ret;
}
@ -371,9 +372,6 @@ static int register_psensor_device(struct i2c_client *client, struct isl29028_da
dev_err(&client->dev,"request_irq failed for gpio %d (%d)\n", client->irq, rc);
goto err_free_gpio;
}
disable_irq(isl->irq);
return 0;