Skip to content

Commit

Permalink
usb-serial: fix shutdown / device_unregister order
Browse files Browse the repository at this point in the history
Ensure that the ->port_remove() callbacks get called before the
->shutdown() callback which makeing the order symmetric with
->attach() being called before ->port_probe().

Signed-off-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jim Radford authored and Greg Kroah-Hartman committed Mar 10, 2007
1 parent 4eaf60e commit d9a7eca
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,6 @@ static void destroy_serial(struct kref *kref)

dbg("%s - %s", __FUNCTION__, serial->type->description);

serial->type->shutdown(serial);

/* return the minor range that this device had */
return_serial(serial);

for (i = 0; i < serial->num_ports; ++i)
serial->port[i]->open_count = 0;

Expand All @@ -150,6 +145,12 @@ static void destroy_serial(struct kref *kref)
serial->port[i] = NULL;
}

if (serial->type->shutdown)
serial->type->shutdown(serial);

/* return the minor range that this device had */
return_serial(serial);

/* If this is a "fake" port, we have to clean it up here, as it will
* not get cleaned up in port_release() as it was never registered with
* the driver core */
Expand Down

0 comments on commit d9a7eca

Please sign in to comment.