From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 13 Jun 2012 22:22:54 +0000 (-0700)
Subject: Merge branch 'usb-linus' into usb-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e17f8af316525c2a795bb314dfcc23201fb51ef4;p=linux-beck.git

Merge branch 'usb-linus' into usb-next

This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

e17f8af316525c2a795bb314dfcc23201fb51ef4
diff --cc drivers/usb/serial/option.c
index 6cb40ec52532,e668a2460bd4..6ff37e67adfa
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -1422,8 -1417,9 +1420,8 @@@ static void option_instat_callback(stru
  static int option_send_setup(struct usb_serial_port *port)
  {
  	struct usb_serial *serial = port->serial;
 -	struct usb_wwan_intf_private *intfdata =
 -		(struct usb_wwan_intf_private *) serial->private;
 +	struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
- 	struct option_port_private *portdata;
+ 	struct usb_wwan_port_private *portdata;
  	int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
  	int val = 0;