aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/i2c-smbus.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/i2c-smbus.c')
-rw-r--r--drivers/i2c/i2c-smbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index 421278221243..a24e0bfe9201 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -22,11 +22,11 @@
22#include <linux/kernel.h> 22#include <linux/kernel.h>
23#include <linux/module.h> 23#include <linux/module.h>
24#include <linux/device.h> 24#include <linux/device.h>
25#include <linux/semaphore.h>
26#include <linux/interrupt.h> 25#include <linux/interrupt.h>
27#include <linux/workqueue.h> 26#include <linux/workqueue.h>
28#include <linux/i2c.h> 27#include <linux/i2c.h>
29#include <linux/i2c-smbus.h> 28#include <linux/i2c-smbus.h>
29#include <linux/slab.h>
30 30
31struct i2c_smbus_alert { 31struct i2c_smbus_alert {
32 unsigned int alert_edge_triggered:1; 32 unsigned int alert_edge_triggered:1;
@@ -55,7 +55,7 @@ static int smbus_do_alert(struct device *dev, void *addrp)
55 * Drivers should either disable alerts, or provide at least 55 * Drivers should either disable alerts, or provide at least
56 * a minimal handler. Lock so client->driver won't change. 56 * a minimal handler. Lock so client->driver won't change.
57 */ 57 */
58 down(&dev->sem); 58 device_lock(dev);
59 if (client->driver) { 59 if (client->driver) {
60 if (client->driver->alert) 60 if (client->driver->alert)
61 client->driver->alert(client, data->flag); 61 client->driver->alert(client, data->flag);
@@ -63,7 +63,7 @@ static int smbus_do_alert(struct device *dev, void *addrp)
63 dev_warn(&client->dev, "no driver alert()!\n"); 63 dev_warn(&client->dev, "no driver alert()!\n");
64 } else 64 } else
65 dev_dbg(&client->dev, "alert with no driver\n"); 65 dev_dbg(&client->dev, "alert with no driver\n");
66 up(&dev->sem); 66 device_unlock(dev);
67 67
68 /* Stop iterating after we find the device */ 68 /* Stop iterating after we find the device */
69 return -EBUSY; 69 return -EBUSY;