USB: OHCI: fix bugs in debug routines

AlanStern · gregkh · commit 256dbcd80f1c · 2014-07-17T17:05:07.000-07:00
The debug routine fill_async_buffer() in ohci-hcd is buggy: It never
produces any output because it forgets to initialize the output buffer
size.  Also, the debug routine ohci_dump() has an unused argument.

This patch adds the correct initialization and removes the unused
argument.

Signed-off-by: Alan Stern &lt;stern@rowland.harvard.edu&gt;
CC: &lt;stable@vger.kernel.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
@@ -236,7 +236,7 @@ ohci_dump_roothub (
 	}
 }
 
-static void ohci_dump (struct ohci_hcd *controller, int verbose)
+static void ohci_dump(struct ohci_hcd *controller)
 {
 	ohci_dbg (controller, "OHCI controller state\n");
 
@@ -464,15 +464,16 @@ show_list (struct ohci_hcd *ohci, char *buf, size_t count, struct ed *ed)
 static ssize_t fill_async_buffer(struct debug_buffer *buf)
 {
 	struct ohci_hcd		*ohci;
-	size_t			temp;
+	size_t			temp, size;
 	unsigned long		flags;
 
 	ohci = buf->ohci;
+	size = PAGE_SIZE;
 
 	/* display control and bulk lists together, for simplicity */
 	spin_lock_irqsave (&ohci->lock, flags);
-	temp = show_list(ohci, buf->page, buf->count, ohci->ed_controltail);
-	temp += show_list(ohci, buf->page + temp, buf->count - temp,
+	temp = show_list(ohci, buf->page, size, ohci->ed_controltail);
+	temp += show_list(ohci, buf->page + temp, size - temp,
 			  ohci->ed_bulktail);
 	spin_unlock_irqrestore (&ohci->lock, flags);
 
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
@@ -76,8 +76,8 @@ static const char	hcd_name [] = "ohci_hcd";
 #include "ohci.h"
 #include "pci-quirks.h"
 
-static void ohci_dump (struct ohci_hcd *ohci, int verbose);
-static void ohci_stop (struct usb_hcd *hcd);
+static void ohci_dump(struct ohci_hcd *ohci);
+static void ohci_stop(struct usb_hcd *hcd);
 
 #include "ohci-hub.c"
 #include "ohci-dbg.c"
@@ -770,7 +770,7 @@ static int ohci_run (struct ohci_hcd *ohci)
 		ohci->ed_to_check = NULL;
 	}
 
-	ohci_dump (ohci, 1);
+	ohci_dump(ohci);
 
 	return 0;
 }
@@ -851,7 +851,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
 			usb_hc_died(hcd);
 		}
 
-		ohci_dump (ohci, 1);
+		ohci_dump(ohci);
 		ohci_usb_reset (ohci);
 	}
 
@@ -951,7 +951,7 @@ static void ohci_stop (struct usb_hcd *hcd)
 {
 	struct ohci_hcd		*ohci = hcd_to_ohci (hcd);
 
-	ohci_dump (ohci, 1);
+	ohci_dump(ohci);
 
 	if (quirk_nec(ohci))
 		flush_work(&ohci->nec_work);

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ ohci_dump_roothub (`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`
`239`		`-static void ohci_dump (struct ohci_hcd *controller, int verbose)`
	`239`	`+static void ohci_dump(struct ohci_hcd *controller)`
`240`	`240`	`{`
`241`	`241`	`ohci_dbg (controller, "OHCI controller state\n");`
`242`	`242`
`@@ -464,15 +464,16 @@ show_list (struct ohci_hcd ohci, char buf, size_t count, struct ed *ed)`
`464`	`464`	`static ssize_t fill_async_buffer(struct debug_buffer *buf)`
`465`	`465`	`{`
`466`	`466`	`struct ohci_hcd *ohci;`
`467`		`- size_t temp;`
	`467`	`+ size_t temp, size;`
`468`	`468`	`unsigned long flags;`
`469`	`469`
`470`	`470`	`ohci = buf->ohci;`
	`471`	`+ size = PAGE_SIZE;`
`471`	`472`
`472`	`473`	`/* display control and bulk lists together, for simplicity */`
`473`	`474`	`spin_lock_irqsave (&ohci->lock, flags);`
`474`		`- temp = show_list(ohci, buf->page, buf->count, ohci->ed_controltail);`
`475`		`- temp += show_list(ohci, buf->page + temp, buf->count - temp,`
	`475`	`+ temp = show_list(ohci, buf->page, size, ohci->ed_controltail);`
	`476`	`+ temp += show_list(ohci, buf->page + temp, size - temp,`
`476`	`477`	`ohci->ed_bulktail);`
`477`	`478`	`spin_unlock_irqrestore (&ohci->lock, flags);`
`478`	`479`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ static const char hcd_name [] = "ohci_hcd";`
`76`	`76`	`#include "ohci.h"`
`77`	`77`	`#include "pci-quirks.h"`
`78`	`78`
`79`		`-static void ohci_dump (struct ohci_hcd *ohci, int verbose);`
`80`		`-static void ohci_stop (struct usb_hcd *hcd);`
	`79`	`+static void ohci_dump(struct ohci_hcd *ohci);`
	`80`	`+static void ohci_stop(struct usb_hcd *hcd);`
`81`	`81`
`82`	`82`	`#include "ohci-hub.c"`
`83`	`83`	`#include "ohci-dbg.c"`
`@@ -770,7 +770,7 @@ static int ohci_run (struct ohci_hcd *ohci)`
`770`	`770`	`ohci->ed_to_check = NULL;`
`771`	`771`	`}`
`772`	`772`
`773`		`- ohci_dump (ohci, 1);`
	`773`	`+ ohci_dump(ohci);`
`774`	`774`
`775`	`775`	`return 0;`
`776`	`776`	`}`
`@@ -851,7 +851,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)`
`851`	`851`	`usb_hc_died(hcd);`
`852`	`852`	`}`
`853`	`853`
`854`		`- ohci_dump (ohci, 1);`
	`854`	`+ ohci_dump(ohci);`
`855`	`855`	`ohci_usb_reset (ohci);`
`856`	`856`	`}`
`857`	`857`
`@@ -951,7 +951,7 @@ static void ohci_stop (struct usb_hcd *hcd)`
`951`	`951`	`{`
`952`	`952`	`struct ohci_hcd *ohci = hcd_to_ohci (hcd);`
`953`	`953`
`954`		`- ohci_dump (ohci, 1);`
	`954`	`+ ohci_dump(ohci);`
`955`	`955`
`956`	`956`	`if (quirk_nec(ohci))`
`957`	`957`	`flush_work(&ohci->nec_work);`