Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c78bd6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes 

single fix for nouveau.

* 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/core: don't leak oclass type bits to user
parents 3aacfda0 2acc8683

drivers/gpu/drm/nouveau/core/core/parent.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) 
	sclass = nv_parent(parent)->sclass;

	while (sclass) {

		if (++nr < size)

			lclass[nr] = sclass->oclass->handle;

			lclass[nr] = sclass->oclass->handle & 0xffff;

		sclass = sclass->sclass;

	}
@@ -96,7 +96,7 @@ nouveau_parent_lclass(struct nouveau_object *parent, u32 *lclass, int size) 
		if (engine && (oclass = engine->sclass)) {

			while (oclass->ofuncs) {

				if (++nr < size)

					lclass[nr] = oclass->handle;

					lclass[nr] = oclass->handle & 0xffff;

				oclass++;

			}

		}