|
@@ -160,12 +160,9 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
|
|
int err;
|
|
int err;
|
|
|
|
|
|
/* Check for valid input */
|
|
/* Check for valid input */
|
|
- if (v4l2_dev == NULL || sd == NULL || !sd->name[0])
|
|
|
|
|
|
+ if (!v4l2_dev || !sd || sd->v4l2_dev || !sd->name[0])
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
- /* Warn if we apparently re-register a subdev */
|
|
|
|
- WARN_ON(sd->v4l2_dev != NULL);
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* The reason to acquire the module here is to avoid unloading
|
|
* The reason to acquire the module here is to avoid unloading
|
|
* a module of sub-device which is registered to a media
|
|
* a module of sub-device which is registered to a media
|