Module Name: src
Committed By: snj
Date: Mon Jan 11 00:52:47 UTC 2010
Modified Files:
src/sys/arch/macppc/dev [netbsd-5]: pbms.c
Log Message:
Apply patch (requested by tsutsui in ticket #916):
Fix crash on detach.
To generate a diff of this commit:
cvs rdiff -u -r1.7.30.1 -r1.7.30.2 src/sys/arch/macppc/dev/pbms.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/pbms.c
diff -u src/sys/arch/macppc/dev/pbms.c:1.7.30.1 src/sys/arch/macppc/dev/pbms.c:1.7.30.2
--- src/sys/arch/macppc/dev/pbms.c:1.7.30.1 Tue Aug 25 18:28:03 2009
+++ src/sys/arch/macppc/dev/pbms.c Mon Jan 11 00:52:47 2010
@@ -1,4 +1,4 @@
-/* $Id: pbms.c,v 1.7.30.1 2009/08/25 18:28:03 snj Exp $ */
+/* $Id: pbms.c,v 1.7.30.2 2010/01/11 00:52:47 snj Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -402,7 +402,7 @@
int
pbms_detach(struct device *self, int flags)
{
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
int ret;
/* The wsmouse driver does all the work. */
@@ -419,7 +419,7 @@
int
pbms_activate(device_ptr_t self, enum devact act)
{
- struct pbms_softc *sc = (struct pbms_softc *)self;
+ struct pbms_softc *sc = device_private(self);
int ret;
if (act == DVACT_DEACTIVATE) {
