Merge tag 'drm-misc-next-2017-05-16' of git://anongit.freedesktop.org/git/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / sti / sti_hqvdp.c

diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c
index 66f843148ef7f5cd25e515fcc49ef4bfc4acba2f..a1c161f77804424e0014c93478f92847559ea484 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hqvdp.c
+++ b/drivers/gpu/drm/sti/sti_hqvdp.c
@@ -625,8 +625,7 @@ static int hqvdp_dbg_show(struct seq_file *s, void *data)
                hqvdp_dbg_dump_cmd(s, (struct sti_hqvdp_cmd *)virt);
        }
 
-       seq_puts(s, "\n");
-
+       seq_putc(s, '\n');
        return 0;
 }
 
@@ -1357,12 +1356,12 @@ static int sti_hqvdp_probe(struct platform_device *pdev)
 
        /* Get Memory resources */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
+       if (!res) {
                DRM_ERROR("Get memory resource failed\n");
                return -ENXIO;
        }
        hqvdp->regs = devm_ioremap(dev, res->start, resource_size(res));
-       if (hqvdp->regs == NULL) {
+       if (!hqvdp->regs) {
                DRM_ERROR("Register mapping failed\n");
                return -ENXIO;
        }