diff options
| author |   Michal Simek <michal.simek@xilinx.com> | 2013-12-19 16:05:05 +0100 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2014-01-04 23:34:29 +0100 |
| commit | 617bdcbc3cb2c828771c2632bd8d57f7df5eea5c (patch) | |
| tree | bf374b6498136941710989a94774d054d9c3c3a5 /drivers/i2c | |
| parent | i2c: xilinx: Fix i2c checkpatch warnings (diff) | |
| download | linux-dev-617bdcbc3cb2c828771c2632bd8d57f7df5eea5c.tar.xz linux-dev-617bdcbc3cb2c828771c2632bd8d57f7df5eea5c.zip | |
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 <michal.simek@xilinx.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-xiic.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |