Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / omap_hdq.c

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 595fd8d48fd1a341807b556300f3befa9592dcc2..880e282b75dfa6452cdd71ccd2e65bf6e2db79b3 100644 (file)
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -16,7 +16,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -515,8 +515,11 @@ static u8 omap_w1_read_byte(void *data)
        int ret;
 
        ret = hdq_read_byte(&val);
-       if (ret)
+       if (ret) {
+               init_trans = 0;
+               omap_hdq_put();
                return -1;
+       }
 
        /* Write followed by a read, release the module */
        if (init_trans) {