fix a bug in the USB driver debug code
SVN-Revision: 11961
This commit is contained in:
parent
8e626bffb7
commit
6fb96b4b63
1 changed files with 4 additions and 4 deletions
|
@ -393,7 +393,6 @@ static inline void remove_debug_files(struct admhcd *bus) { }
|
||||||
static int debug_async_open(struct inode *, struct file *);
|
static int debug_async_open(struct inode *, struct file *);
|
||||||
static int debug_periodic_open(struct inode *, struct file *);
|
static int debug_periodic_open(struct inode *, struct file *);
|
||||||
static int debug_registers_open(struct inode *, struct file *);
|
static int debug_registers_open(struct inode *, struct file *);
|
||||||
static int debug_async_open(struct inode *, struct file *);
|
|
||||||
static ssize_t debug_output(struct file*, char __user*, size_t, loff_t*);
|
static ssize_t debug_output(struct file*, char __user*, size_t, loff_t*);
|
||||||
static int debug_close(struct inode *, struct file *);
|
static int debug_close(struct inode *, struct file *);
|
||||||
|
|
||||||
|
@ -429,7 +428,8 @@ struct debug_buffer {
|
||||||
static ssize_t
|
static ssize_t
|
||||||
show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
|
show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
|
||||||
{
|
{
|
||||||
unsigned temp, size = count;
|
unsigned temp;
|
||||||
|
unsigned size = count;
|
||||||
|
|
||||||
if (!ed)
|
if (!ed)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -488,6 +488,7 @@ show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
|
||||||
|
|
||||||
ed = ed->ed_next;
|
ed = ed->ed_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
return count - size;
|
return count - size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -503,9 +504,8 @@ static ssize_t fill_async_buffer(struct debug_buffer *buf)
|
||||||
hcd = bus_to_hcd(bus);
|
hcd = bus_to_hcd(bus);
|
||||||
ahcd = hcd_to_admhcd(hcd);
|
ahcd = hcd_to_admhcd(hcd);
|
||||||
|
|
||||||
/* display control and bulk lists together, for simplicity */
|
|
||||||
spin_lock_irqsave(&ahcd->lock, flags);
|
spin_lock_irqsave(&ahcd->lock, flags);
|
||||||
temp = show_list(ahcd, buf->page, buf->count, ahcd->ed_head);
|
temp = show_list(ahcd, buf->page, PAGE_SIZE, ahcd->ed_head);
|
||||||
spin_unlock_irqrestore(&ahcd->lock, flags);
|
spin_unlock_irqrestore(&ahcd->lock, flags);
|
||||||
|
|
||||||
return temp;
|
return temp;
|
||||||
|
|
Loading…
Reference in a new issue