projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[cascardo/linux.git]
/
drivers
/
i2c
/
i2c-smbus.c
diff --git
a/drivers/i2c/i2c-smbus.c
b/drivers/i2c/i2c-smbus.c
index
4212782
..
a24e0bf
100644
(file)
--- a/
drivers/i2c/i2c-smbus.c
+++ b/
drivers/i2c/i2c-smbus.c
@@
-22,11
+22,11
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/device.h>
-#include <linux/semaphore.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
#include <linux/i2c.h>
#include <linux/i2c-smbus.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
#include <linux/i2c.h>
#include <linux/i2c-smbus.h>
+#include <linux/slab.h>
struct i2c_smbus_alert {
unsigned int alert_edge_triggered:1;
struct i2c_smbus_alert {
unsigned int alert_edge_triggered:1;
@@
-55,7
+55,7
@@
static int smbus_do_alert(struct device *dev, void *addrp)
* Drivers should either disable alerts, or provide at least
* a minimal handler. Lock so client->driver won't change.
*/
* Drivers should either disable alerts, or provide at least
* a minimal handler. Lock so client->driver won't change.
*/
- d
own(&dev->sem
);
+ d
evice_lock(dev
);
if (client->driver) {
if (client->driver->alert)
client->driver->alert(client, data->flag);
if (client->driver) {
if (client->driver->alert)
client->driver->alert(client, data->flag);
@@
-63,7
+63,7
@@
static int smbus_do_alert(struct device *dev, void *addrp)
dev_warn(&client->dev, "no driver alert()!\n");
} else
dev_dbg(&client->dev, "alert with no driver\n");
dev_warn(&client->dev, "no driver alert()!\n");
} else
dev_dbg(&client->dev, "alert with no driver\n");
-
up(&dev->sem
);
+
device_unlock(dev
);
/* Stop iterating after we find the device */
return -EBUSY;
/* Stop iterating after we find the device */
return -EBUSY;