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

Commit 7cdffc86 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: preserve configuration information if request_io fails partly 



If pcmcia_request_io() only fails partly -- for the second of two
requested resources -- preserve the configuration settings for the
first one.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 151b6a5f

drivers/pcmcia/pcmcia_resource.c

+6 −0
Original line number Diff line number Diff line
@@ -595,7 +595,13 @@ int pcmcia_request_io(struct pcmcia_device *p_dev) 
	if (c->io[1].end) {

		ret = alloc_io_space(s, &c->io[1], p_dev->io_lines);

		if (ret) {

			struct resource tmp = c->io[0];

			/* release the previously allocated resource */

			release_io_space(s, &c->io[0]);

			/* but preserve the settings, for they worked... */

			c->io[0].end = resource_size(&tmp);

			c->io[0].start = tmp.start;

			c->io[0].flags = tmp.flags;

			goto out;

		}

	} else