On Tue, 9 Mar 2010 10:28:28 +1100, Stephen Rothwell wrote:
> I have been carrying this patch in linux-next for some time and now
> mainline needs it.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> drivers/i2c/i2c-smbus.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
> index 333527c..52aa775 100644
> --- a/drivers/i2c/i2c-smbus.c
> +++ b/drivers/i2c/i2c-smbus.c
> @@ -27,6 +27,7 @@
> #include <linux/workqueue.h>
> #include <linux/i2c.h>
> #include <linux/i2c-smbus.h>
> +#include <linux/mutex.h>
>
> struct i2c_smbus_alert {
> unsigned int alert_edge_triggered:1;
> @@ -55,7 +56,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.
> */
> - down(&dev->sem);
> + device_lock(dev);
> if (client->driver) {
> if (client->driver->alert)
> client->driver->alert(client, data->flag);
> @@ -63,7 +64,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");
> - up(&dev->sem);
> + device_unlock(dev);
>
> /* Stop iterating after we find the device */
> return -EBUSY;
Thanks for the reminder Stephen. I was only waiting for device_lock()
to become usable in mainline. Now that it happened, I will take the
patch above in my i2c tree, and send it to Linus in my next batch.
--
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
