Skip to content

Commit

Permalink
Merge branch 'for-5.10/intel-ish-hid' into for-linus
Browse files Browse the repository at this point in the history
- intel-ish-hid code cleanup
  • Loading branch information
Jiri Kosina committed Oct 15, 2020
2 parents 1341c58 + 36725cb commit d61a5d6
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/hid/intel-ish-hid/ishtp/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,20 +502,14 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)
int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
struct module *owner)
{
int err;

if (!ishtp_device_ready)
return -ENODEV;

driver->driver.name = driver->name;
driver->driver.owner = owner;
driver->driver.bus = &ishtp_cl_bus_type;

err = driver_register(&driver->driver);
if (err)
return err;

return 0;
return driver_register(&driver->driver);
}
EXPORT_SYMBOL(ishtp_cl_driver_register);

Expand Down

0 comments on commit d61a5d6

Please sign in to comment.