Commit 0c195afb authored by Russell King's avatar Russell King Committed by Wolfram Sang

I2C: mv64xxx: fix error handling for request_irq()

Propagate the error code from request_irq() rather than ignoring it
entirely.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 2c911103
...@@ -630,12 +630,12 @@ mv64xxx_i2c_probe(struct platform_device *pd) ...@@ -630,12 +630,12 @@ mv64xxx_i2c_probe(struct platform_device *pd)
mv64xxx_i2c_hw_init(drv_data); mv64xxx_i2c_hw_init(drv_data);
if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, rc = request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
MV64XXX_I2C_CTLR_NAME, drv_data)) { MV64XXX_I2C_CTLR_NAME, drv_data);
if (rc) {
dev_err(&drv_data->adapter.dev, dev_err(&drv_data->adapter.dev,
"mv64xxx: Can't register intr handler irq: %d\n", "mv64xxx: Can't register intr handler irq%d: %d\n",
drv_data->irq); drv_data->irq, rc);
rc = -EINVAL;
goto exit_clk; goto exit_clk;
} else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) { } else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) {
dev_err(&drv_data->adapter.dev, dev_err(&drv_data->adapter.dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment