diff options
Diffstat (limited to 'usr/src/uts/common/io/pcic.c')
| -rw-r--r-- | usr/src/uts/common/io/pcic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/pcic.c b/usr/src/uts/common/io/pcic.c index fbc7cf1f1e..bbf9e11f9e 100644 --- a/usr/src/uts/common/io/pcic.c +++ b/usr/src/uts/common/io/pcic.c @@ -141,14 +141,14 @@ struct bus_ops pcmciabus_ops = { NULL, /* (*bus_remove_eventcall)(); */ NULL, /* (*bus_post_event)(); */ NULL, /* (*bus_intr_ctl)(); */ - NULL, /* (*bus_config)(); */ - NULL, /* (*bus_unconfig)(); */ - NULL, /* (*bus_fm_init)(); */ - NULL, /* (*bus_fm_fini)(); */ + NULL, /* (*bus_config)(); */ + NULL, /* (*bus_unconfig)(); */ + NULL, /* (*bus_fm_init)(); */ + NULL, /* (*bus_fm_fini)(); */ NULL, /* (*bus_enter)() */ NULL, /* (*bus_exit)() */ NULL, /* (*bus_power)() */ - pcmcia_intr_ops /* (*bus_intr_op)(); */ + pcmcia_intr_ops /* (*bus_intr_op)(); */ }; static struct cb_ops pcic_cbops = { @@ -2827,7 +2827,7 @@ pcic_set_window(dev_info_t *dip, set_window_t *window) (void) pcmcia_free_mem(memp->res_dip, &res); memp->pcw_status &= ~(PCW_MAPPED|PCW_ENABLED); memp->pcw_hostmem = NULL; - memp->pcw_base = NULL; + memp->pcw_base = 0; memp->pcw_len = 0; } @@ -2886,7 +2886,7 @@ pcic_set_window(dev_info_t *dip, set_window_t *window) (window->socket << 16), (caddr_t *)&memp->pcw_hostmem, &memp->pcw_handle, - &window->attr, NULL); + &window->attr, 0); if (which != DDI_SUCCESS) { @@ -6082,7 +6082,7 @@ pcic_close(dev_t dev, int flag, int otyp, cred_t *cred) static int pcic_ioctl(dev_t dev, int cmd, intptr_t arg, int mode, cred_t *cred, - int *rval) + int *rval) { #ifdef CARDBUS if (cardbus_is_cb_minor(dev)) |