Bug 24044
| Summary: | Kernel panics with UMASS_DEBUG enabled | ||
|---|---|---|---|
| Product: | Base System | Reporter: | Mike Bristow <mike> |
| Component: | kern | Assignee: | Nick Hibma <n_hibma> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | 5.0-CURRENT | ||
| Hardware: | Any | ||
| OS: | Any | ||
|
Description
Mike Bristow
2001-01-03 12:20:01 UTC
Responsible Changed From-To: freebsd-bugs->n_hibma I gues that if it is on my plate I should it. . sc_dev seems to be unset in umass_match_proto. Please try the following
patch, or send me a message if you would like the whole files.
Nick
Index: usb_port.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/usb_port.h,v
retrieving revision 1.33
diff -u -r1.33 usb_port.h
--- usb_port.h 2000/08/04 19:05:49 1.33
+++ usb_port.h 2001/01/03 13:48:08
@@ -107,6 +107,8 @@
#define USB_MATCH_START(dname, uaa) \
struct usb_attach_arg *uaa = aux
+#define USB_MATCH_SETUP /* nop */
+
#define USB_ATTACH(dname) \
void \
__CONCAT(dname,_attach)(parent, self, aux) \
@@ -221,6 +223,8 @@
#define USB_MATCH_START(dname, uaa) \
struct usb_attach_arg *uaa = aux
+#define USB_MATCH_SETUP /* nop */
+
#define USB_ATTACH(dname) \
void \
__CONCAT(dname,_attach)(parent, self, aux) \
@@ -331,6 +335,9 @@
#define USB_MATCH_START(dname, uaa) \
struct usb_attach_arg *uaa = device_get_ivars(self)
+
+#define USB_MATCH_SETUP \
+ sc->sc_dev = self
#define USB_ATTACH(dname) \
Static int \
Index: umass.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/umass.c,v
retrieving revision 1.36
diff -u -r1.36 umass.c
--- umass.c 2000/12/20 09:37:35 1.36
+++ umass.c 2001/01/03 13:47:42
@@ -700,6 +700,8 @@
USB_MATCH_START(umass, uaa);
struct umass_softc *sc = device_get_softc(self);
+ USB_MATCH_SETUP;
+
if (uaa->iface == NULL)
return(UMATCH_NONE);
On Wed, Jan 03, 2001 at 01:51:21PM +0000, Nick Hibma wrote:
> sc_dev seems to be unset in umass_match_proto. Please try the following
> patch, or send me a message if you would like the whole files.
The patch fixes the panic for me, when I plug in a FujiFilm FinePix
1300 (not MX 1300 as I mistakenly reported originally)
cheers,
Mike
--
Mike Bristow, seebitwopie
Cheers. I'll commit it then. Nick > On Wed, Jan 03, 2001 at 01:51:21PM +0000, Nick Hibma wrote: > > sc_dev seems to be unset in umass_match_proto. Please try the following > > patch, or send me a message if you would like the whole files. > > The patch fixes the panic for me, when I plug in a FujiFilm FinePix > 1300 (not MX 1300 as I mistakenly reported originally) > > cheers, > Mike > > -- > Mike Bristow, seebitwopie > -- Qube Software, Ltd. Private: n_hibma@qubesoft.com n_hibma@webweaving.org n_hibma@freebsd.org http://www.qubesoft.com/ http://www.etla.net/~n_hibma/ State Changed From-To: open->closed Patch committed. |
