From 3d7669838b8cc7c269d504d407379ddebad7e615 Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Date: Fri, 17 Nov 2006 11:53:23 +0100
Subject: [PATCH] --- yaml --- r: 41311 b: refs/heads/master c:
 a3b1f50ce2fdc73c7e60e04c0a2235af74deac2b h: refs/heads/master i:   41309:
 78385bbdcae21c56d222977d3b330f6eb55e297e   41307:
 2257d6036497ceb6e9a0455ecf6345358871cf3d   41303:
 62b77e99de1d54ad071e06c33bdf7545137acdbd   41295:
 d7b9e6eb6aecfe7e93567d22c176e34888c11dbb   41279:
 47d8420ebbbaf45a74e1d5565813c4b3b8ac1a0c v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/image/microtek.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index bfda961159ca..67b356fc04d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49314378ac9b76c40f221e3e5aed866e912e7e99
+refs/heads/master: a3b1f50ce2fdc73c7e60e04c0a2235af74deac2b
diff --git a/trunk/drivers/usb/image/microtek.c b/trunk/drivers/usb/image/microtek.c
index 3038ed0700d3..8ccddf74534a 100644
--- a/trunk/drivers/usb/image/microtek.c
+++ b/trunk/drivers/usb/image/microtek.c
@@ -796,7 +796,7 @@ static int mts_usb_probe(struct usb_interface *intf,
 
 	new_desc->context.scsi_status = kmalloc(1, GFP_KERNEL);
 	if (!new_desc->context.scsi_status)
-		goto out_kfree2;
+		goto out_free_urb;
 
 	new_desc->usb_dev = dev;
 	new_desc->usb_intf = intf;
@@ -822,18 +822,20 @@ static int mts_usb_probe(struct usb_interface *intf,
 	new_desc->host = scsi_host_alloc(&mts_scsi_host_template,
 			sizeof(new_desc));
 	if (!new_desc->host)
-		goto out_free_urb;
+		goto out_kfree2;
 
 	new_desc->host->hostdata[0] = (unsigned long)new_desc;
 	if (scsi_add_host(new_desc->host, NULL)) {
 		err_retval = -EIO;
-		goto out_free_urb;
+		goto out_host_put;
 	}
 	scsi_scan_host(new_desc->host);
 
 	usb_set_intfdata(intf, new_desc);
 	return 0;
 
+ out_host_put:
+	scsi_host_put(new_desc->host);
  out_kfree2:
 	kfree(new_desc->context.scsi_status);
  out_free_urb: