git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
irda-usb.c
diff --git
a/drivers/net/irda/irda-usb.c
b/drivers/net/irda/irda-usb.c
index
e4ea619
..
d9267cb
100644
(file)
--- a/
drivers/net/irda/irda-usb.c
+++ b/
drivers/net/irda/irda-usb.c
@@
-370,7
+370,7
@@
static void speed_bulk_callback(struct urb *urb)
/* urb is now available */
//urb->status = 0; -> tested above
/* urb is now available */
//urb->status = 0; -> tested above
- /* New speed and xbof is now commited in hardware */
+ /* New speed and xbof is now commit
t
ed in hardware */
self->new_speed = -1;
self->new_xbofs = -1;
self->new_speed = -1;
self->new_xbofs = -1;
@@
-602,7
+602,7
@@
static void write_bulk_callback(struct urb *urb)
IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);
irda_usb_change_speed_xbofs(self);
} else {
IRDA_DEBUG(1, "%s(), Changing speed now...\n", __func__);
irda_usb_change_speed_xbofs(self);
} else {
- /* New speed and xbof is now commited in hardware */
+ /* New speed and xbof is now commit
t
ed in hardware */
self->new_speed = -1;
self->new_xbofs = -1;
/* Done, waiting for next packet */
self->new_speed = -1;
self->new_xbofs = -1;
/* Done, waiting for next packet */