b43: N-PHY: use enum for RSSI type everywhere we use it

[~andy/linux] / drivers / video / jz4740_fb.c

diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
index d999bb5e04851bf857dc396c318dbead0de1bb15..36979b4131ab0d24f724e2565c7fcc0c9bbe285b 100644 (file)
--- a/drivers/video/jz4740_fb.c
+++ b/drivers/video/jz4740_fb.c
@@ -660,9 +660,9 @@ static int jzfb_probe(struct platform_device *pdev)
        }
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       jzfb->base = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!jzfb->base) {
-               ret = -EBUSY;
+       jzfb->base = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(jzfb->base)) {
+               ret = PTR_ERR(jzfb->base);
                goto err_framebuffer_release;
        }