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

Commit 17393dd6 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jeff Garzik
Browse files

e100, fix iomap read 



There were 2 omitted readb's used on an iomap space. eliminate them
by using ioread8 instead.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent bd8774c8

drivers/net/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 
		if ((le16_to_cpu(rfd->command) & cb_el) &&

		    (RU_RUNNING == nic->ru_running))



			if (readb(&nic->csr->scb.status) & rus_no_res)

			if (ioread8(&nic->csr->scb.status) & rus_no_res)

				nic->ru_running = RU_SUSPENDED;

		return -ENODATA;

	}
@@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, 
	if ((le16_to_cpu(rfd->command) & cb_el) &&

	    (RU_RUNNING == nic->ru_running)) {



	    if (readb(&nic->csr->scb.status) & rus_no_res)

	    if (ioread8(&nic->csr->scb.status) & rus_no_res)

		nic->ru_running = RU_SUSPENDED;

	}