aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/mon/mon_main.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/mon/mon_main.c
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/mon/mon_main.c')
-rw-r--r--drivers/usb/mon/mon_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
index 812dc288bb8c..10405119985c 100644
--- a/drivers/usb/mon/mon_main.c
+++ b/drivers/usb/mon/mon_main.c
@@ -90,7 +90,6 @@ static void mon_bus_submit(struct mon_bus *mbus, struct urb *urb)
90 r->rnf_submit(r->r_data, urb); 90 r->rnf_submit(r->r_data, urb);
91 } 91 }
92 spin_unlock_irqrestore(&mbus->lock, flags); 92 spin_unlock_irqrestore(&mbus->lock, flags);
93 return;
94} 93}
95 94
96static void mon_submit(struct usb_bus *ubus, struct urb *urb) 95static void mon_submit(struct usb_bus *ubus, struct urb *urb)
@@ -117,7 +116,6 @@ static void mon_bus_submit_error(struct mon_bus *mbus, struct urb *urb, int erro
117 r->rnf_error(r->r_data, urb, error); 116 r->rnf_error(r->r_data, urb, error);
118 } 117 }
119 spin_unlock_irqrestore(&mbus->lock, flags); 118 spin_unlock_irqrestore(&mbus->lock, flags);
120 return;
121} 119}
122 120
123static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error) 121static void mon_submit_error(struct usb_bus *ubus, struct urb *urb, int error)