From da4c6a9a9aff4df091e1f0664f90c4d87ebad303 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 30 Nov 2011 11:43:41 +0300
Subject: [PATCH] --- yaml --- r: 281223 b: refs/heads/master c:
 4bd8b4de6f806f1429d23a2f6e2549ed0e8bc49b h: refs/heads/master i:   281221:
 5f1f96e6e1490c81b3f55bfbb7ed591211903d33   281219:
 635319ac6cd462914d47eb27559b53f872492dd8   281215:
 6931a6066d7f27f7787f3fdc4b0e604854de8ece v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/line6/driver.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e3fc4c12b465..20808c189da8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f75c0510784e9f6ce8808b01fb826d89d0ffbcd6
+refs/heads/master: 4bd8b4de6f806f1429d23a2f6e2549ed0e8bc49b
diff --git a/trunk/drivers/staging/line6/driver.c b/trunk/drivers/staging/line6/driver.c
index a71a5af7f8e3..a2f48ee463ee 100644
--- a/trunk/drivers/staging/line6/driver.c
+++ b/trunk/drivers/staging/line6/driver.c
@@ -726,8 +726,8 @@ static int line6_probe(struct usb_interface *interface,
 		       const struct usb_device_id *id)
 {
 	int devtype;
-	struct usb_device *usbdev = NULL;
-	struct usb_line6 *line6 = NULL;
+	struct usb_device *usbdev;
+	struct usb_line6 *line6;
 	const struct line6_properties *properties;
 	int devnum;
 	int interface_number, alternate = 0;
@@ -936,7 +936,7 @@ static int line6_probe(struct usb_interface *interface,
 	}
 
 	if (size == 0) {
-		dev_err(line6->ifcdev,
+		dev_err(&interface->dev,
 			"driver bug: interface data size not set\n");
 		ret = -ENODEV;
 		goto err_put;