Commit 2254f637 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/nouveau: fix up 32-bit ioctls and device wake up. 



Noticed by kbuild test robot.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a5b6f74e

drivers/gpu/drm/nouveau/nouveau_ioc32.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd, 
	if (fn != NULL)

		ret = (*fn)(filp, cmd, arg);

	else

		ret = drm_ioctl(filp, cmd, arg);

		ret = nouveau_drm_ioctl(filp, cmd, arg);



	return ret;

}

drivers/gpu/drm/nouveau/nouveau_ioctl.h

+1 −0
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
#define __NOUVEAU_IOCTL_H__



long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);

long nouveau_drm_ioctl(struct file *, unsigned int cmd, unsigned long arg);



#endif