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

Commit 4bdb0fba authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

rt61pci: fix-up merge damage 



A subtle merge error was introduced after re-queueing a patch for 2.6.24
instead of 2.6.25...

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13f09b95

drivers/net/wireless/rt2x00/rt61pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1736,7 +1736,8 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) 
			WARNING(rt2x00dev,

				"TX status report missed for entry %p\n",

				entry_done);

			rt2x00lib_txdone(entry_done, TX_FAIL_OTHER, 0);

			rt2x00pci_txdone(rt2x00dev, entry_done, TX_FAIL_OTHER,

					 0);

			entry_done = rt2x00_get_data_entry_done(ring);

		}