Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[cascardo/linux.git] / drivers / char / tile-srom.c

diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c
index ae82933..0e506ba 100644 (file)
--- a/drivers/char/tile-srom.c
+++ b/drivers/char/tile-srom.c
@@ -353,7 +353,7 @@ static int srom_setup_minor(struct srom_dev *srom, int index)
 
        dev = device_create(srom_class, &platform_bus,
                            MKDEV(srom_major, index), srom, "%d", index);
-       return PTR_RET(dev);
+       return PTR_ERR_OR_ZERO(dev);
 }
 
 /** srom_init() - Initialize the driver's module. */