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

Commit 2aff541c authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: fix oops in static mapping case 



As static maps do not have IO resources, this setting oopses. However, as
we do not ever read this value, we can safely remove it.

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

drivers/pcmcia/pcmcia_resource.c

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base, 
	}

	if ((s->features & SS_CAP_STATIC_MAP) && s->io_offset) {

		*base = s->io_offset | (*base & 0x0fff);

		s->io[0].res->flags = (s->io[0].res->flags & ~IORESOURCE_BITS) | (attr & IORESOURCE_BITS);

		return 0;

	}

	/* Check for an already-allocated window that must conflict with