ARM: 8523/1: sa1111: ensure no negative value gets returned on positive match

mszyprow · Russell King · commit 17f29d36e473 · 2016-02-16T16:28:50.000Z
This patch ensures that existing bus match callbacks don't return
negative values (which might be interpreted as potential errors in the
future) in case of positive match.

Signed-off-by: Marek Szyprowski &lt;m.szyprowski@samsung.com&gt;
Signed-off-by: Russell King &lt;rmk+kernel@arm.linux.org.uk&gt;
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
@@ -1290,7 +1290,7 @@ static int sa1111_match(struct device *_dev, struct device_driver *_drv)
 	struct sa1111_dev *dev = SA1111_DEV(_dev);
 	struct sa1111_driver *drv = SA1111_DRV(_drv);
 
-	return dev->devid & drv->devid;
+	return !!(dev->devid & drv->devid);
 }
 
 static int sa1111_bus_suspend(struct device *dev, pm_message_t state)

Original file line number	Diff line number	Diff line change
`@@ -1290,7 +1290,7 @@ static int sa1111_match(struct device _dev, struct device_driver _drv)`
`1290`	`1290`	`struct sa1111_dev *dev = SA1111_DEV(_dev);`
`1291`	`1291`	`struct sa1111_driver *drv = SA1111_DRV(_drv);`
`1292`	`1292`
`1293`		`- return dev->devid & drv->devid;`
	`1293`	`+ return !!(dev->devid & drv->devid);`
`1294`	`1294`	`}`
`1295`	`1295`
`1296`	`1296`	`static int sa1111_bus_suspend(struct device *dev, pm_message_t state)`