2004-03-11 16:09:10

by Paul Fulghum

[permalink] [raw]
Subject: [PATCH] 2.6.4 synclink_cs.c

Patch for synclink_cs.c against 2.6.4

* Track driver API changes
* Remove cast (kernel janitor)

Please apply.

--
Paul Fulghum
[email protected]

--- linux-2.6.4/drivers/char/pcmcia/synclink_cs.c 2004-03-11 08:37:38.000000000 -0600
+++ linux-2.6.4-mg1/drivers/char/pcmcia/synclink_cs.c 2004-03-11 08:46:43.000000000 -0600
@@ -1,7 +1,7 @@
/*
* linux/drivers/char/pcmcia/synclink_cs.c
*
- * $Id: synclink_cs.c,v 4.15 2003/09/05 15:26:02 paulkf Exp $
+ * $Id: synclink_cs.c,v 4.21 2004/03/08 15:29:23 paulkf Exp $
*
* Device driver for Microgate SyncLink PC Card
* multiprotocol serial adapter.
@@ -489,7 +489,7 @@
MODULE_LICENSE("GPL");

static char *driver_name = "SyncLink PC Card driver";
-static char *driver_version = "$Revision: 4.15 $";
+static char *driver_version = "$Revision: 4.21 $";

static struct tty_driver *serial_driver;

@@ -4233,12 +4233,13 @@
info->if_ptr = &info->pppdev;
info->netdev = info->pppdev.dev = d;

- sppp_attach(&info->pppdev);
-
d->base_addr = info->io_base;
d->irq = info->irq_level;
d->priv = info;

+ sppp_attach(&info->pppdev);
+ mgslpc_setup(d);
+
if (register_netdev(d)) {
printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
sppp_detach(info->netdev);
@@ -4413,7 +4414,7 @@

int mgslpc_sppp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- MGSLPC_INFO *info = (MGSLPC_INFO *)dev->priv;
+ MGSLPC_INFO *info = dev->priv;
if (debug_level >= DEBUG_LEVEL_INFO)
printk("%s(%d):mgslpc_ioctl %s cmd=%08X\n", __FILE__,__LINE__,
info->netname, cmd );