summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/nvec/nvec.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index e9af66a08448..c6be750bee9d 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -811,13 +811,12 @@ static int tegra_nvec_probe(struct platform_device *pdev)
nvec->irq = platform_get_irq(pdev, 0);
if (nvec->irq < 0)
- return -ENODEV;
+ return nvec->irq;
i2c_clk = devm_clk_get(dev, "div-clk");
- if (IS_ERR(i2c_clk)) {
- dev_err(dev, "failed to get controller clock\n");
- return -ENODEV;
- }
+ if (IS_ERR(i2c_clk))
+ return dev_err_probe(dev, PTR_ERR(i2c_clk),
+ "failed to get controller clock\n");
nvec->rst = devm_reset_control_get_exclusive(dev, "i2c");
if (IS_ERR(nvec->rst)) {
@@ -849,10 +848,8 @@ static int tegra_nvec_probe(struct platform_device *pdev)
err = devm_request_irq(dev, nvec->irq, nvec_interrupt, IRQF_NO_AUTOEN,
"nvec", nvec);
- if (err) {
- dev_err(dev, "couldn't request irq\n");
- return -ENODEV;
- }
+ if (err)
+ return dev_err_probe(dev, err, "couldn't request irq\n");
tegra_init_i2c_slave(nvec);