blob: 030c6fc7d80572e9f2775568e5f47b2cd8e1cbad [file] [log] [blame]
From stable-bounces@linux.kernel.org Wed Nov 28 14:52:43 2007
From: Oliver Neukum <oliver@neukum.org>
Date: Wed, 28 Nov 2007 14:50:02 -0800
Subject: USB: make the microtek driver and HAL cooperate
To: linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.de>, Oliver Neukum <oliver@neukum.org>, stable <stable@kernel.org>, Greg Kroah-Hartman <gregkh@suse.de>
Message-ID: <1196290207-28564-20-git-send-email-gregkh@suse.de>
From: Oliver Neukum <oliver@neukum.org>
patch 5cf1973a44bd298e3cfce6f6af8faa8c9d0a6d55 in mainline
to make HAL like the microtek driver's devices the parent must be
correctly set.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/image/microtek.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -824,7 +824,7 @@ static int mts_usb_probe(struct usb_inte
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;
}