Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee87d6d0 authored by Jan Beulich's avatar Jan Beulich Committed by David Vrabel
Browse files

xen-pciback: short-circuit read path used for merging write values 



There's no point calling xen_pcibk_config_read() here - all it'll do is
return whatever conf_space_read() returns for the field which was found
here (and which would be found there again). Also there's no point
clearing tmp_val before the call.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 58520360

drivers/xen/xen-pciback/conf_space.c

+2 −4
Original line number Diff line number Diff line
@@ -230,10 +230,8 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value) 
		field_end = OFFSET(cfg_entry) + field->size;



		 if (req_end > field_start && field_end > req_start) {

			tmp_val = 0;



			err = xen_pcibk_config_read(dev, field_start,

						  field->size, &tmp_val);

			err = conf_space_read(dev, cfg_entry, field_start,

					      &tmp_val);

			if (err)

				break;