+ if (ivi_output->output) {
+ /* ivi_output->output destruction may be deferred in
+ * some cases (see drm_output_destroy()), so we need to
+ * forcibly trigger the destruction callback now, or
+ * otherwise would later access data that we are about
+ * to free
+ */
+ struct weston_output *save = ivi_output->output;
+
+ handle_output_destroy(&ivi_output->output_destroy, save);
+ weston_output_destroy(save);
+ }