From: Kevin Curtis <kevin.curtis@farsite.co.uk>
To: "'akpm@zip.com.au'" <akpm@zip.com.au>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2.5.8] farsync.c driver updates
Date: Mon, 15 Apr 2002 11:10:34 +0100 [thread overview]
Message-ID: <7C078C66B7752B438B88E11E5E20E72E4294@GENERAL.farsite.co.uk> (raw)
Andrew,
please incorporate the following patch into the next release of the
2.5 Kernel. It removes the references to the rmem_start and rmem_end fields
no longer supported in the net device structure, and moves the call to the
pci_enable_device (thanks Morten).
Kevin
--- farsync.c.orig Mon Apr 15 10:38:41 2002
+++ farsync.c Mon Apr 15 10:42:03 2002
@@ -1469,10 +1469,6 @@
+ BUF_OFFSET ( txBuffer[i][0][0]);
dev->mem_end = card->phys_mem
+ BUF_OFFSET (
txBuffer[i][NUM_TX_BUFFER][0]);
- dev->rmem_start = card->phys_mem
- + BUF_OFFSET ( rxBuffer[i][0][0]);
- dev->rmem_end = card->phys_mem
- + BUF_OFFSET (
rxBuffer[i][NUM_RX_BUFFER][0]);
dev->base_addr = card->pci_conf;
dev->irq = card->irq;
@@ -1531,6 +1527,13 @@
}
memset ( card, 0, sizeof ( struct fst_card_info ));
+ /* Try to enable the device */
+ if (( err = pci_enable_device ( pdev )) != 0 )
+ {
+ printk_err ("Failed to enable card. Err %d\n", -err );
+ goto error_free_card;
+ }
+
/* Record info we need*/
card->irq = pdev->irq;
card->pci_conf = pci_resource_start ( pdev, 1 );
@@ -1570,12 +1573,6 @@
goto error_release_mem;
}
- /* Try to enable the device */
- if (( err = pci_enable_device ( pdev )) != 0 )
- {
- printk_err ("Failed to enable card. Err %d\n", -err );
- goto error_release_ctlmem;
- }
/* Get virtual addresses of memory regions */
if (( card->mem = ioremap ( card->phys_mem, FST_MEMSIZE )) == NULL
)
reply other threads:[~2002-04-15 10:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7C078C66B7752B438B88E11E5E20E72E4294@GENERAL.farsite.co.uk \
--to=kevin.curtis@farsite.co.uk \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).