mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 23:51:37 +00:00
Merge branch 'for-5.10/intel-ish-hid' into for-linus
- intel-ish-hid code cleanup
This commit is contained in:
commit
d61a5d6314
@ -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,
|
||||
struct module *owner)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!ishtp_device_ready)
|
||||
return -ENODEV;
|
||||
|
||||
@ -511,11 +509,7 @@ int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
|
||||
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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user