ChangeSet 1.1165.2.3, 2003/04/23 12:05:10-07:00, david-b@pacbell.net
[PATCH] USB: hcd-pci.c catch up to dev_printk changes
The preceding patch to fix this was incomplete, since
it didn't work for the pure debug messages. And that
was because the DEBUG-vs-CONFIG_USB_DEBUG stuff changed
somewhere.
drivers/usb/core/hcd-pci.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff -Nru a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hcd-pci.c Thu Apr 24 16:28:14 2003
+++ b/drivers/usb/core/hcd-pci.c Thu Apr 24 16:28:14 2003
@@ -17,11 +17,6 @@
*/
#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <asm/irq.h>
#ifdef CONFIG_USB_DEBUG
#define DEBUG
@@ -29,6 +24,11 @@
#undef DEBUG
#endif
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+#include <asm/irq.h>
#include <linux/usb.h>
#include "hcd.h"
@@ -214,7 +214,7 @@
hub = hcd->self.root_hub;
hcd->state = USB_STATE_QUIESCING;
- dev_dbg (*hcd->controller, "roothub graceful disconnect\n");
+ dev_dbg (hcd->controller, "roothub graceful disconnect\n");
usb_disconnect (&hub);
hcd->driver->stop (hcd);
@@ -326,7 +326,7 @@
retval = -EBUSY;
if (hcd->state != USB_STATE_SUSPENDED) {
- dev_dbg (*hcd->controller, "can't resume, not suspended!\n");
+ dev_dbg (hcd->controller, "can't resume, not suspended!\n");
goto done;
}
hcd->state = USB_STATE_RESUMING;
@@ -336,7 +336,7 @@
retval = hcd->driver->resume (hcd);
if (!HCD_IS_RUNNING (hcd->state)) {
- dev_dbg (*hcd->controller, "resume fail, retval %d\n", retval);
+ dev_dbg (hcd->controller, "resume fail, retval %d\n", retval);
usb_hc_died (hcd);
// FIXME: recover, reset etc.
} else {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Apr 30 2003 - 22:00:19 EST