Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If the card is being detached, do not try to write the CCR to disable the 

function.
This commit is contained in:
mycroft 2004-08-12 17:31:06 +00:00
parent 438f4e5647
commit 3c4f1ecaa3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pcmcia/pcmcia.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmcia.c,v 1.68 2004/08/12 17:26:51 mycroft Exp $ */
/* $NetBSD: pcmcia.c,v 1.69 2004/08/12 17:31:06 mycroft Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.68 2004/08/12 17:26:51 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.69 2004/08/12 17:31:06 mycroft Exp $");
#include "opt_pcmciaverbose.h"
@ -227,6 +227,7 @@ pcmcia_card_detach(dev, flags)
* or in user context detaching a device by user request.
*/
SIMPLEQ_FOREACH(pf, &sc->card.pf_head, pf_list) {
pf->pf_flags |= PFF_DETACHED;
if (SIMPLEQ_EMPTY(&pf->cfe_head))
continue;
if (pf->child == NULL)
@ -614,7 +615,8 @@ pcmcia_function_disable(pf)
goto out;
}
if (pcmcia_mfc(sc)) {
if (pcmcia_mfc(sc) &&
(pf->pf_flags & PFF_DETACHED) == 0) {
reg = pcmcia_ccr_read(pf, PCMCIA_CCR_OPTION);
reg &= ~(PCMCIA_CCR_OPTION_FUNC_ENABLE|
PCMCIA_CCR_OPTION_ADDR_DECODE|

3
sys/dev/pcmcia/pcmciavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcmciavar.h,v 1.26 2004/08/12 16:04:20 mycroft Exp $ */
/* $NetBSD: pcmciavar.h,v 1.27 2004/08/12 17:31:06 mycroft Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -160,6 +160,7 @@ struct pcmcia_function {
/* pf_flags */
#define PFF_ENABLED 0x0001 /* function is enabled */
#define PFF_DETACHED 0x0002 /* card is detached */
SIMPLEQ_HEAD(pcmcia_function_head, pcmcia_function);