diff options
Diffstat (limited to 'drivers/hsi/controllers/omap_ssi_port.c')
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_port.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c index 29aea0b93360..4c0b5820581e 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c @@ -177,13 +177,13 @@ static int __init ssi_debug_add_port(struct omap_ssi_port *omap_port, struct hsi_port *port = to_hsi_port(omap_port->dev); dir = debugfs_create_dir(dev_name(omap_port->dev), dir); - if (IS_ERR(dir)) - return PTR_ERR(dir); + if (!dir) + return -ENOMEM; omap_port->dir = dir; debugfs_create_file("regs", S_IRUGO, dir, port, &ssi_port_regs_fops); dir = debugfs_create_dir("sst", dir); - if (IS_ERR(dir)) - return PTR_ERR(dir); + if (!dir) + return -ENOMEM; debugfs_create_file("divisor", S_IRUGO | S_IWUSR, dir, port, &ssi_sst_div_fops); @@ -1013,11 +1013,12 @@ static int __init ssi_port_irq(struct hsi_port *port, struct omap_ssi_port *omap_port = hsi_port_drvdata(port); int err; - omap_port->irq = platform_get_irq(pd, 0); - if (omap_port->irq < 0) { + err = platform_get_irq(pd, 0); + if (err < 0) { dev_err(&port->device, "Port IRQ resource missing\n"); - return omap_port->irq; + return err; } + omap_port->irq = err; tasklet_init(&omap_port->pio_tasklet, ssi_pio_tasklet, (unsigned long)port); err = devm_request_irq(&port->device, omap_port->irq, ssi_pio_isr, |