Skip to content

Commit d61a5d6

Browse files
author
Jiri Kosina
committed
Merge branch 'for-5.10/intel-ish-hid' into for-linus
- intel-ish-hid code cleanup
2 parents 1341c58 + 36725cb commit d61a5d6

File tree

1 file changed

+1
-7
lines changed
  • drivers/hid/intel-ish-hid/ishtp

1 file changed

+1
-7
lines changed

drivers/hid/intel-ish-hid/ishtp/bus.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -502,20 +502,14 @@ static void ishtp_bus_remove_device(struct ishtp_cl_device *device)
502502
int ishtp_cl_driver_register(struct ishtp_cl_driver *driver,
503503
struct module *owner)
504504
{
505-
int err;
506-
507505
if (!ishtp_device_ready)
508506
return -ENODEV;
509507

510508
driver->driver.name = driver->name;
511509
driver->driver.owner = owner;
512510
driver->driver.bus = &ishtp_cl_bus_type;
513511

514-
err = driver_register(&driver->driver);
515-
if (err)
516-
return err;
517-
518-
return 0;
512+
return driver_register(&driver->driver);
519513
}
520514
EXPORT_SYMBOL(ishtp_cl_driver_register);
521515

0 commit comments

Comments
 (0)