Commit d61a5d63 authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-5.10/intel-ish-hid' into for-linus

- intel-ish-hid code cleanup
parents 1341c586 36725cb0
...@@ -502,8 +502,6 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device) ...@@ -502,8 +502,6 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)
int ishtp_cl_driver_register(struct ishtp_cl_driver *driver, int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
struct module *owner) struct module *owner)
{ {
int err;
if (!ishtp_device_ready) if (!ishtp_device_ready)
return -ENODEV; return -ENODEV;
...@@ -511,11 +509,7 @@ int ishtp_cl_driver_register(struct ishtp_cl_driver *driver, ...@@ -511,11 +509,7 @@ int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
driver->driver.owner = owner; driver->driver.owner = owner;
driver->driver.bus = &ishtp_cl_bus_type; driver->driver.bus = &ishtp_cl_bus_type;
err = driver_register(&driver->driver); return driver_register(&driver->driver);
if (err)
return err;
return 0;
} }
EXPORT_SYMBOL(ishtp_cl_driver_register); EXPORT_SYMBOL(ishtp_cl_driver_register);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment