Commit d61a5d63 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- intel-ish-hid code cleanup
parents 1341c586 36725cb0

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

+1 −7
Original line number Diff line number Diff line
@@ -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);