diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2012-03-02 19:01:23 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2012-03-02 19:01:23 -0500 |
| commit | 15e1afcd5e908ae29b1e6018838638befdc225a2 (patch) | |
| tree | 3bbbffe597d2f2e0d037ef18cbaaf932447e1377 /usr/src/uts/common/io/1394 | |
| parent | 88b44bf4e73233af70877930178dbff7f1c2992b (diff) | |
| download | illumos-gate-15e1afcd5e908ae29b1e6018838638befdc225a2.tar.gz | |
backout 998: breaks common closed drivers
Diffstat (limited to 'usr/src/uts/common/io/1394')
| -rw-r--r-- | usr/src/uts/common/io/1394/nx1394.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr/src/uts/common/io/1394/nx1394.c b/usr/src/uts/common/io/1394/nx1394.c index 216b70a319..cc710b8417 100644 --- a/usr/src/uts/common/io/1394/nx1394.c +++ b/usr/src/uts/common/io/1394/nx1394.c @@ -23,9 +23,8 @@ * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -/* - * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. - */ + +#pragma ident "%Z%%M% %I% %E% SMI" /* * nx1394.c @@ -73,7 +72,7 @@ struct bus_ops nx1394_busops = { NULL, /* bus_add_intrspec */ NULL, /* bus_remove_intrspec */ i_ddi_map_fault, /* XXXX bus_map_fault */ - NULL, /* bus_dma_map */ + ddi_dma_map, /* bus_dma_map */ nx1394_dma_allochdl, ddi_dma_freehdl, ddi_dma_bindhdl, @@ -392,7 +391,7 @@ nx1394_add_eventcall(dev_info_t *dip, dev_info_t *rdip, #if defined(DEBUG) event_name = ndi_event_cookie_to_name(hal->hal_ndi_event_hdl, cookie); if (event_name == NULL) - event_name = ""; + event_name = ""; #endif TNF_PROBE_4_DEBUG(nx1394_add_eventcall_exit, S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, (void *)dip, tnf_opaque, requestor_dip, @@ -431,7 +430,7 @@ nx1394_remove_eventcall(dev_info_t *dip, ddi_callback_id_t cb_id) #if defined(DEBUG) event_name = ndi_event_cookie_to_name(hal->hal_ndi_event_hdl, cookie); if (event_name == NULL) - event_name = ""; + event_name = ""; TNF_PROBE_4_DEBUG(nx1394_remove_eventcall_exit, S1394_TNF_SL_NEXUS_STACK, "", tnf_opaque, parent_dip, (void *)dip, |