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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
w1
/
masters
/
omap_hdq.c
diff --git
a/drivers/w1/masters/omap_hdq.c
b/drivers/w1/masters/omap_hdq.c
index
38e96ab
..
5ef385b
100644
(file)
--- a/
drivers/w1/masters/omap_hdq.c
+++ b/
drivers/w1/masters/omap_hdq.c
@@
-545,7
+545,7
@@
static void omap_w1_write_byte(void *_hdq, u8 byte)
return;
}
- /* Second write, data transfered. Release the module */
+ /* Second write, data transfer
r
ed. Release the module */
if (hdq_data->init_trans > 1) {
omap_hdq_put(hdq_data);
ret = mutex_lock_interruptible(&hdq_data->hdq_mutex);