From bdb558ed44ff42bcbeb0e6fd3020e53840b1fafe Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Thu, 28 Jun 2012 20:41:29 +0530 Subject: [PATCH] --- yaml --- r: 319171 b: refs/heads/master c: 0e33bbb25436949cc100d40edfbe0f96dfa25882 h: refs/heads/master i: 319169: af96c777e31ee7002795daa4c4a242a66fbca3b9 319167: d3981f888ebca0d67efa3034ce55844fb0c225fd v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-omap.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 37f9ec43e743..d3e90bf6602f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5692d2a22ed9c1a1bc3030bd8188f335b1b0b58c +refs/heads/master: 0e33bbb25436949cc100d40edfbe0f96dfa25882 diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c index b9915bb9343d..6d05f1878ca0 100644 --- a/trunk/drivers/i2c/busses/i2c-omap.c +++ b/trunk/drivers/i2c/busses/i2c-omap.c @@ -490,7 +490,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR; omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w); - init_completion(&dev->cmd_complete); + INIT_COMPLETION(dev->cmd_complete); dev->cmd_err = 0; w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; @@ -999,6 +999,7 @@ omap_i2c_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, dev); + init_completion(&dev->cmd_complete); dev->reg_shift = (dev->flags >> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;