1 files changed, 18 insertions, 5 deletions

diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 6ecc27302211..275a66f83058 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -97,6 +97,7 @@ static void mon_submit(struct usb_bus *ubus, struct urb *urb)
         if (mbus->nreaders == 0)
                 goto out_locked;
 
+        mbus->cnt_events++;
         list_for_each (pos, &mbus->r_list) {
                 r = list_entry(pos, struct mon_reader, r_link);
                 r->rnf_submit(r->r_data, urb);
@@ -113,20 +114,32 @@ out_unlocked:
 
 /*
  */
-static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int err)
+static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error)
 {
         struct mon_bus *mbus;
+        unsigned long flags;
+        struct list_head *pos;
+        struct mon_reader *r;
 
         mbus = ubus->mon_bus;
         if (mbus == NULL)
                 goto out_unlocked;
 
-        /*
-         * XXX Capture the error code and the 'E' event.
-         */
+        spin_lock_irqsave(&mbus->lock, flags);
+        if (mbus->nreaders == 0)
+                goto out_locked;
 
+        mbus->cnt_events++;
+        list_for_each (pos, &mbus->r_list) {
+                r = list_entry(pos, struct mon_reader, r_link);
+                r->rnf_error(r->r_data, urb, error);
+        }
+
+        spin_unlock_irqrestore(&mbus->lock, flags);
         return;
 
+out_locked:
+        spin_unlock_irqrestore(&mbus->lock, flags);
 out_unlocked:
         return;
 }
@@ -152,6 +165,7 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb)
         }
 
         spin_lock_irqsave(&mbus->lock, flags);
+        mbus->cnt_events++;
         list_for_each (pos, &mbus->r_list) {
                 r = list_entry(pos, struct mon_reader, r_link);
                 r->rnf_complete(r->r_data, urb);
@@ -163,7 +177,6 @@ static void mon_complete(struct usb_bus *ubus, struct urb *urb)
 
 /*
  * Stop monitoring.
- * Obviously this must be well locked, so no need to play with mb's.
  */
 static void mon_stop(struct mon_bus *mbus)
 {