summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2007-11-12 14:08:43 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-28 13:58:35 -0800
commit5cf1973a44bd298e3cfce6f6af8faa8c9d0a6d55 (patch)
treea2205312fa4b775d1a3346bfa29c041bdaecce45 /drivers
parent4a9bee8256a2dec26290a3bfff86ab86b8992547 (diff)
downloadblackbird-op-linux-5cf1973a44bd298e3cfce6f6af8faa8c9d0a6d55.tar.gz
blackbird-op-linux-5cf1973a44bd298e3cfce6f6af8faa8c9d0a6d55.zip
USB: make the microtek driver and HAL cooperate
to make HAL like the microtek driver's devices the parent must be correctly set. Signed-off-by: Oliver Neukum <oneukum@suse.de> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/image/microtek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 91e999c9f680..bc207e3c21f5 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -819,7 +819,7 @@ static int mts_usb_probe(struct usb_interface *intf,
goto out_kfree2;
new_desc->host->hostdata[0] = (unsigned long)new_desc;
- if (scsi_add_host(new_desc->host, NULL)) {
+ if (scsi_add_host(new_desc->host, &dev->dev)) {
err_retval = -EIO;
goto out_host_put;
}
OpenPOWER on IntegriCloud