From 01addbc856291e96d3504c2544e17b11489e8a4c Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Wed, 30 May 2012 12:24:59 +0200 Subject: [PATCH] --- yaml --- r: 316855 b: refs/heads/master c: a276400d14bb5b98a5db1d87bbee7b1621abe4a1 h: refs/heads/master i: 316853: e20439897b528ccfb7d875b86eb0d81b96741dbb 316851: 2c7a545128204130afa7fbfac8e8b431b73d68b5 316847: efad39f350e721c5080c4dbde71cdc3031d4251c v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/option.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 12de76e15ea5..a31a3c2157a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2e935a7db6e7354e9dd138b7f6f4c53affc09d9 +refs/heads/master: a276400d14bb5b98a5db1d87bbee7b1621abe4a1 diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c index 1aae9028cd0b..6cb40ec52532 100644 --- a/trunk/drivers/usb/serial/option.c +++ b/trunk/drivers/usb/serial/option.c @@ -1347,12 +1347,15 @@ static int option_probe(struct usb_serial *serial, serial->interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA) return -ENODEV; - data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); + data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); if (!data) return -ENOMEM; data->send_setup = option_send_setup; spin_lock_init(&data->susp_lock); data->private = (void *)id->driver_info; + + usb_set_serial_data(serial, data); + return 0; } @@ -1419,8 +1422,7 @@ static void option_instat_callback(struct urb *urb) 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; int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber; int val = 0;