Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364405
b: refs/heads/master
c: c3452f5
h: refs/heads/master
i:
  364403: c1b4266
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Mar 25, 2013
1 parent 6ae35a0 commit dd63f36
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79b80b8a1141ba0605e917a6fc12d44383ab29b8
refs/heads/master: c3452f5e444446fad9bb1957d22a25334798f94c
12 changes: 6 additions & 6 deletions trunk/drivers/usb/serial/usb-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -1291,12 +1291,12 @@ module_exit(usb_serial_exit);
do { \
if (!type->function) { \
type->function = usb_serial_generic_##function; \
pr_debug("Had to override the " #function \
" usb serial operation with the generic one.");\
} \
pr_debug("%s: using generic " #function "\n", \
type->driver.name); \
} \
} while (0)

static void fixup_generic(struct usb_serial_driver *device)
static void usb_serial_operations_init(struct usb_serial_driver *device)
{
set_to_generic_if_null(device, open);
set_to_generic_if_null(device, write);
Expand All @@ -1316,8 +1316,6 @@ static int usb_serial_register(struct usb_serial_driver *driver)
if (usb_disabled())
return -ENODEV;

fixup_generic(driver);

if (!driver->description)
driver->description = driver->driver.name;
if (!driver->usb_driver) {
Expand All @@ -1326,6 +1324,8 @@ static int usb_serial_register(struct usb_serial_driver *driver)
return -EINVAL;
}

usb_serial_operations_init(driver);

/* Add this device to our list of devices */
mutex_lock(&table_lock);
list_add(&driver->driver_list, &usb_serial_driver_list);
Expand Down

0 comments on commit dd63f36

Please sign in to comment.