From 88db2a3f9ecd4147fb1784e383c583f3398bf7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Thu, 2 Jun 2022 15:06:20 +0200 Subject: [PATCH] genesys: scaler: Fix calling to parent's vfunc close() This uses the internal flag FU_DEVICE_INTERNAL_FLAG_USE_PARENT_FOR_OPEN, to fix the calling to the parent's vfunc close() (it was calling the parent's vfunc open() on close()). --- plugins/genesys/fu-genesys-scaler-device.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/plugins/genesys/fu-genesys-scaler-device.c b/plugins/genesys/fu-genesys-scaler-device.c index 0a0ee7613..7f9acec3a 100644 --- a/plugins/genesys/fu-genesys-scaler-device.c +++ b/plugins/genesys/fu-genesys-scaler-device.c @@ -1621,22 +1621,6 @@ fu_genesys_scaler_device_probe(FuDevice *device, GError **error) return TRUE; } -static gboolean -fu_genesys_scaler_device_open(FuDevice *device, GError **error) -{ - FuDevice *parent_device = fu_device_get_parent(device); - - return fu_device_open(parent_device, error); -} - -static gboolean -fu_genesys_scaler_device_close(FuDevice *device, GError **error) -{ - FuDevice *parent_device = fu_device_get_parent(device); - - return fu_device_open(parent_device, error); -} - static gboolean fu_genesys_scaler_device_setup(FuDevice *device, GError **error) { @@ -1957,6 +1941,7 @@ fu_genesys_scaler_device_init(FuGenesysScalerDevice *self) fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_DUAL_IMAGE); fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_UNSIGNED_PAYLOAD); fu_device_add_flag(FU_DEVICE(self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE); + fu_device_add_internal_flag(FU_DEVICE(self), FU_DEVICE_INTERNAL_FLAG_USE_PARENT_FOR_OPEN); fu_device_register_private_flag(FU_DEVICE(self), FU_SCALER_FLAG_PAUSE_R2_CPU, "pause-r2-cpu"); @@ -1974,8 +1959,6 @@ fu_genesys_scaler_device_class_init(FuGenesysScalerDeviceClass *klass) { FuDeviceClass *klass_device = FU_DEVICE_CLASS(klass); klass_device->probe = fu_genesys_scaler_device_probe; - klass_device->open = fu_genesys_scaler_device_open; - klass_device->close = fu_genesys_scaler_device_close; klass_device->setup = fu_genesys_scaler_device_setup; klass_device->dump_firmware = fu_genesys_scaler_device_dump_firmware; klass_device->prepare_firmware = fu_genesys_scaler_device_prepare_firmware;