From: Michal Simek Date: Thu, 19 Dec 2013 15:05:05 +0000 (+0100) Subject: i2c: xilinx: Do not enable irq before irq handler X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=617bdcbc3cb2c828771c2632bd8d57f7df5eea5c;p=linux-beck.git i2c: xilinx: Do not enable irq before irq handler IRQ handler has to be register first before IRQ is enabled in xiic_reinit(). Signed-off-by: Michal Simek Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 5e5fae7d87f2..2d559896c678 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -731,8 +731,6 @@ static int xiic_i2c_probe(struct platform_device *pdev) i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = pdev->dev.of_node; - xiic_reinit(i2c); - spin_lock_init(&i2c->lock); init_waitqueue_head(&i2c->wait); ret = request_irq(irq, xiic_isr, 0, pdev->name, i2c); @@ -741,6 +739,8 @@ static int xiic_i2c_probe(struct platform_device *pdev) goto request_irq_failed; } + xiic_reinit(i2c); + /* add i2c adapter to i2c tree */ ret = i2c_add_adapter(&i2c->adap); if (ret) {