diff options
Diffstat (limited to 'drivers/media/video/ov9740.c')
| -rw-r--r-- | drivers/media/video/ov9740.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c index ede48f2ed70c..edd1ffcca30b 100644 --- a/drivers/media/video/ov9740.c +++ b/drivers/media/video/ov9740.c | |||
| @@ -898,16 +898,9 @@ static int ov9740_video_probe(struct soc_camera_device *icd, | |||
| 898 | u8 modelhi, modello; | 898 | u8 modelhi, modello; |
| 899 | int ret; | 899 | int ret; |
| 900 | 900 | ||
| 901 | /* | 901 | /* We must have a parent by now. And it cannot be a wrong one. */ |
| 902 | * We must have a parent by now. And it cannot be a wrong one. | 902 | BUG_ON(!icd->parent || |
| 903 | * So this entire test is completely redundant. | 903 | to_soc_camera_host(icd->parent)->nr != icd->iface); |
| 904 | */ | ||
| 905 | if (!icd->dev.parent || | ||
| 906 | to_soc_camera_host(icd->dev.parent)->nr != icd->iface) { | ||
| 907 | dev_err(&client->dev, "Parent missing or invalid!\n"); | ||
| 908 | ret = -ENODEV; | ||
| 909 | goto err; | ||
| 910 | } | ||
| 911 | 904 | ||
| 912 | /* | 905 | /* |
| 913 | * check and show product ID and manufacturer ID | 906 | * check and show product ID and manufacturer ID |