summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-01-09 13:42:58 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-01-09 13:42:58 +0000
commit741809a9276076e66cd3748a5886214042c5940d (patch)
treea6b75acf1d10db629f9fc0e4b65ce0a01c4e33c4
parent989a89cefe0e2eec8431f704b8b430a1b9cbb475 (diff)
Fix the burner method, here the cookie is a pointer to rasops_info.
Problem noticed by Nick Gray and brett@ and analysed with mikeb@. ok jsg@
-rw-r--r--sys/dev/pci/drm/radeon/radeon_fb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_fb.c b/sys/dev/pci/drm/radeon/radeon_fb.c
index 659693dd9d9..a451b71aba5 100644
--- a/sys/dev/pci/drm/radeon/radeon_fb.c
+++ b/sys/dev/pci/drm/radeon/radeon_fb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeon_fb.c,v 1.3 2013/12/05 13:29:56 kettenis Exp $ */
+/* $OpenBSD: radeon_fb.c,v 1.4 2014/01/09 13:42:57 mpi Exp $ */
/*
* Copyright © 2007 David Airlie
*
@@ -494,7 +494,8 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
void
radeondrm_burner(void *v, u_int on, u_int flags)
{
- struct radeon_device *rdev = v;
+ struct rasops_info *ri = v;
+ struct radeon_device *rdev = ri->ri_hw;
task_del(systq, &rdev->burner_task);