diff options
Diffstat (limited to 'drivers/usb/serial/oti6858.c')
-rw-r--r-- | drivers/usb/serial/oti6858.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 7de54781fe61..3cece27325e7 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -159,7 +159,7 @@ static int oti6858_tiocmget(struct tty_struct *tty, struct file *file); | |||
159 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | 159 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, |
160 | unsigned int set, unsigned int clear); | 160 | unsigned int set, unsigned int clear); |
161 | static int oti6858_startup(struct usb_serial *serial); | 161 | static int oti6858_startup(struct usb_serial *serial); |
162 | static void oti6858_shutdown(struct usb_serial *serial); | 162 | static void oti6858_release(struct usb_serial *serial); |
163 | 163 | ||
164 | /* functions operating on buffers */ | 164 | /* functions operating on buffers */ |
165 | static struct oti6858_buf *oti6858_buf_alloc(unsigned int size); | 165 | static struct oti6858_buf *oti6858_buf_alloc(unsigned int size); |
@@ -194,7 +194,7 @@ static struct usb_serial_driver oti6858_device = { | |||
194 | .write_room = oti6858_write_room, | 194 | .write_room = oti6858_write_room, |
195 | .chars_in_buffer = oti6858_chars_in_buffer, | 195 | .chars_in_buffer = oti6858_chars_in_buffer, |
196 | .attach = oti6858_startup, | 196 | .attach = oti6858_startup, |
197 | .shutdown = oti6858_shutdown, | 197 | .release = oti6858_release, |
198 | }; | 198 | }; |
199 | 199 | ||
200 | struct oti6858_private { | 200 | struct oti6858_private { |
@@ -782,7 +782,7 @@ static int oti6858_ioctl(struct tty_struct *tty, struct file *file, | |||
782 | } | 782 | } |
783 | 783 | ||
784 | 784 | ||
785 | static void oti6858_shutdown(struct usb_serial *serial) | 785 | static void oti6858_release(struct usb_serial *serial) |
786 | { | 786 | { |
787 | struct oti6858_private *priv; | 787 | struct oti6858_private *priv; |
788 | int i; | 788 | int i; |
@@ -794,7 +794,6 @@ static void oti6858_shutdown(struct usb_serial *serial) | |||
794 | if (priv) { | 794 | if (priv) { |
795 | oti6858_buf_free(priv->buf); | 795 | oti6858_buf_free(priv->buf); |
796 | kfree(priv); | 796 | kfree(priv); |
797 | usb_set_serial_port_data(serial->port[i], NULL); | ||
798 | } | 797 | } |
799 | } | 798 | } |
800 | } | 799 | } |