3 files changed, 42 insertions, 25 deletions

diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c
index b5abaae38e97..4f7e1d770f81 100644
--- a/drivers/w1/masters/ds2490.c
+++ b/drivers/w1/masters/ds2490.c
@@ -1002,26 +1002,7 @@ static void ds_disconnect(struct usb_interface *intf)
         kfree(dev);
 }
 
-static int ds_init(void)
-{
-        int err;
-
-        err = usb_register(&ds_driver);
-        if (err) {
-                printk(KERN_INFO "Failed to register DS9490R USB device: err=%d.\n", err);
-                return err;
-        }
-
-        return 0;
-}
-
-static void ds_fini(void)
-{
-        usb_deregister(&ds_driver);
-}
-
-module_init(ds_init);
-module_exit(ds_fini);
+module_usb_driver(ds_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index a1ef9b5b38cf..ff29ae747ee8 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -175,11 +175,13 @@ static ssize_t w1_therm_read(struct device *device,
 {
         struct w1_slave *sl = dev_to_w1_slave(device);
         struct w1_master *dev = sl->master;
-        u8 rom[9], crc, verdict;
+        u8 rom[9], crc, verdict, external_power;
         int i, max_trying = 10;
         ssize_t c = PAGE_SIZE;
 
-        mutex_lock(&dev->mutex);
+        i = mutex_lock_interruptible(&dev->mutex);
+        if (i != 0)
+                return i;
 
         memset(rom, 0, sizeof(rom));
 
@@ -190,13 +192,37 @@ static ssize_t w1_therm_read(struct device *device,
                 if (!w1_reset_select_slave(sl)) {
                         int count = 0;
                         unsigned int tm = 750;
+                        unsigned long sleep_rem;
+
+                        w1_write_8(dev, W1_READ_PSUPPLY);
+                        external_power = w1_read_8(dev);
+
+                        if (w1_reset_select_slave(sl))
+                                continue;
 
                         /* 750ms strong pullup (or delay) after the convert */
-                        if (w1_strong_pullup)
+                        if (!external_power && w1_strong_pullup)
                                 w1_next_pullup(dev, tm);
+
                         w1_write_8(dev, W1_CONVERT_TEMP);
-                        if (!w1_strong_pullup)
-                                msleep(tm);
+
+                        if (external_power) {
+                                mutex_unlock(&dev->mutex);
+
+                                sleep_rem = msleep_interruptible(tm);
+                                if (sleep_rem != 0)
+                                        return -EINTR;
+
+                                i = mutex_lock_interruptible(&dev->mutex);
+                                if (i != 0)
+                                        return i;
+                        } else if (!w1_strong_pullup) {
+                                sleep_rem = msleep_interruptible(tm);
+                                if (sleep_rem != 0) {
+                                        mutex_unlock(&dev->mutex);
+                                        return -EINTR;
+                                }
+                        }
 
                         if (!w1_reset_select_slave(sl)) {
 
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index c37497823851..9761950697b4 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -892,6 +892,16 @@ void w1_search(struct w1_master *dev, u8 search_type, w1_slave_found_callback cb
                         break;
                 }
 
+                /* Do fast search on single slave bus */
+                if (dev->max_slave_count == 1) {
+                        w1_write_8(dev, W1_READ_ROM);
+
+                        if (w1_read_block(dev, (u8 *)&rn, 8) == 8 && rn)
+                                cb(dev, rn);
+
+                        break;
+                }
+
                 /* Start the search */
                 w1_write_8(dev, search_type);
                 for (i = 0; i < 64; ++i) {