diff --git a/[refs] b/[refs]
index db47aaecabbd..d12f25f61489 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2451a84839187cd9d150ff1bfac4f5febbcce7a6
+refs/heads/master: 275b5d2061c20749582060be68b6ec4692736d28
diff --git a/trunk/drivers/char/tile-srom.c b/trunk/drivers/char/tile-srom.c
index 3b22a606f79d..2e2036e940fc 100644
--- a/trunk/drivers/char/tile-srom.c
+++ b/trunk/drivers/char/tile-srom.c
@@ -371,7 +371,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 IS_ERR(dev) ? PTR_ERR(dev) : 0;
+	return PTR_RET(dev);
 }
 
 /** srom_init() - Initialize the driver's module. */