From 5d1d270537e363ef3f2200cf78bae6d10e9dc3ad Mon Sep 17 00:00:00 2001 From: Troy Kisky Date: Mon, 14 Jul 2008 22:38:21 +0200 Subject: [PATCH] --- yaml --- r: 101275 b: refs/heads/master c: 2e7437879897a4185bd84478a0451e5367dee7ed h: refs/heads/master i: 101273: 3ab405e51c490386f784b310a289a06db60f92b7 101271: ff458b837e8b4643c6464a42fd5766bf97a658ad v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-davinci.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a5cb8c2fa33b..449f282c8d19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a0d5f5ffa5d294d895ef54fc220c6182db63998 +refs/heads/master: 2e7437879897a4185bd84478a0451e5367dee7ed diff --git a/trunk/drivers/i2c/busses/i2c-davinci.c b/trunk/drivers/i2c/busses/i2c-davinci.c index 160857296952..af3846eda985 100644 --- a/trunk/drivers/i2c/busses/i2c-davinci.c +++ b/trunk/drivers/i2c/busses/i2c-davinci.c @@ -262,7 +262,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop) davinci_i2c_write_reg(dev, DAVINCI_I2C_CNT_REG, dev->buf_len); - init_completion(&dev->cmd_complete); + INIT_COMPLETION(dev->cmd_complete); dev->cmd_err = 0; /* Take I2C out of reset, configure it as master and set the @@ -519,6 +519,7 @@ static int davinci_i2c_probe(struct platform_device *pdev) goto err_release_region; } + init_completion(&dev->cmd_complete); dev->dev = get_device(&pdev->dev); dev->irq = irq->start; platform_set_drvdata(pdev, dev);