Commit 53f6b243 authored by Jani Nikula's avatar Jani Nikula
parent 127704f5
...@@ -1311,10 +1311,8 @@ parse_device_mapping(struct drm_i915_private *dev_priv, ...@@ -1311,10 +1311,8 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
/* get the number of child device that is present */ /* get the number of child device that is present */
for (i = 0; i < child_device_num; i++) { for (i = 0; i < child_device_num; i++) {
child = child_device_ptr(defs, i); child = child_device_ptr(defs, i);
if (!child->device_type) { if (!child->device_type)
/* skip the device block if device type is invalid */
continue; continue;
}
count++; count++;
} }
if (!count) { if (!count) {
...@@ -1331,10 +1329,8 @@ parse_device_mapping(struct drm_i915_private *dev_priv, ...@@ -1331,10 +1329,8 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
count = 0; count = 0;
for (i = 0; i < child_device_num; i++) { for (i = 0; i < child_device_num; i++) {
child = child_device_ptr(defs, i); child = child_device_ptr(defs, i);
if (!child->device_type) { if (!child->device_type)
/* skip the device block if device type is invalid */
continue; continue;
}
/* /*
* Copy as much as we know (sizeof) and is available * Copy as much as we know (sizeof) and is available
...@@ -1345,7 +1341,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv, ...@@ -1345,7 +1341,6 @@ parse_device_mapping(struct drm_i915_private *dev_priv,
min_t(size_t, defs->child_dev_size, sizeof(*child))); min_t(size_t, defs->child_dev_size, sizeof(*child)));
count++; count++;
} }
return;
} }
/* Common defaults which may be overridden by VBT. */ /* Common defaults which may be overridden by VBT. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment