diff -Nru hw-detect-1.114ubuntu1/debian/changelog hw-detect-1.114ubuntu2/debian/changelog
--- hw-detect-1.114ubuntu1/debian/changelog	2015-12-04 17:19:21.000000000 +0000
+++ hw-detect-1.114ubuntu2/debian/changelog	2016-02-17 18:59:09.000000000 +0000
@@ -1,3 +1,10 @@
+hw-detect (1.114ubuntu2) xenial; urgency=medium
+
+  * disk-detect.sh: load SCSI device handlers before SCSI low-level
+    device drivers (LP: #1546606).
+
+ -- Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>  Wed, 17 Feb 2016 10:19:45 -0200
+
 hw-detect (1.114ubuntu1) xenial; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:
diff -Nru hw-detect-1.114ubuntu1/disk-detect.sh hw-detect-1.114ubuntu2/disk-detect.sh
--- hw-detect-1.114ubuntu1/disk-detect.sh	2015-12-04 16:18:05.000000000 +0000
+++ hw-detect-1.114ubuntu2/disk-detect.sh	2016-02-17 18:56:32.000000000 +0000
@@ -123,6 +123,13 @@
 	fi
 }
 
+# Load SCSI device handlers before SCSI low-level device drivers.
+# (attached on SCSI scan; handle some I/O errors more gracefully)
+depmod -a >/dev/null 2>&1
+for mod in $(list_modules_dir /lib/modules/*/kernel/drivers/scsi/device_handler); do
+	module_probe "$mod"
+done
+
 if ! hw-detect disk-detect/detect_progress_title; then
 	log "hw-detect exited nonzero"
 fi