On Thu, 13 Oct 2016, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> I was a bit over-eager in my cleanup in
>
> commit 95c081c17f284de50eaca60d4d55643a64d39019
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date: Tue Jun 21 10:54:12 2016 +0200
>
> drm: Move master pointer from drm_minor to drm_device
>
> Noticed by Chris Wilson.
>
> Fixes: 95c081c17f28 ("drm: Move master pointer from drm_minor to drm_device")
Cc: <stable at vger.kernel.org> # v4.8+
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> Cc: Julia Lawall <julia.lawall at lip6.fr>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
> drivers/gpu/drm/drm_info.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 1df2d33d0b40..ffb2ab389d1d 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -54,9 +54,6 @@ int drm_name_info(struct seq_file *m, void *data)
>
> mutex_lock(&dev->master_mutex);
> master = dev->master;
> - if (!master)
> - goto out_unlock;
> -
> seq_printf(m, "%s", dev->driver->name);
> if (dev->dev)
> seq_printf(m, " dev=%s", dev_name(dev->dev));
> @@ -65,7 +62,6 @@ int drm_name_info(struct seq_file *m, void *data)
> if (dev->unique)
> seq_printf(m, " unique=%s", dev->unique);
> seq_printf(m, "\n");
> -out_unlock:
> mutex_unlock(&dev->master_mutex);
>
> return 0;
--
Jani Nikula, Intel Open Source Technology Center
