projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
char
/
pcmcia
/
synclink_cs.c
diff --git
a/drivers/char/pcmcia/synclink_cs.c
b/drivers/char/pcmcia/synclink_cs.c
index
0c141c2
..
d1ecb2c
100644
(file)
--- a/
drivers/char/pcmcia/synclink_cs.c
+++ b/
drivers/char/pcmcia/synclink_cs.c
@@
-57,7
+57,6
@@
#include <linux/netdevice.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
-#include <asm/serial.h>
#include <linux/delay.h>
#include <linux/ioctl.h>
#include <linux/delay.h>
#include <linux/ioctl.h>
@@
-1174,8
+1173,12
@@
static void dcd_change(MGSLPC_INFO *info)
else
info->input_signal_events.dcd_down++;
#ifdef CONFIG_HDLC
else
info->input_signal_events.dcd_down++;
#ifdef CONFIG_HDLC
- if (info->netcount)
- hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, info->netdev);
+ if (info->netcount) {
+ if (info->serial_signals & SerialSignal_DCD)
+ netif_carrier_on(info->netdev);
+ else
+ netif_carrier_off(info->netdev);
+ }
#endif
wake_up_interruptible(&info->status_event_wait_q);
wake_up_interruptible(&info->event_wait_q);
#endif
wake_up_interruptible(&info->status_event_wait_q);
wake_up_interruptible(&info->event_wait_q);
@@
-1582,7
+1585,7
@@
static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char"))
return;
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char"))
return;
- if (!
tty || !
info->tx_buf)
+ if (!info->tx_buf)
return;
spin_lock_irqsave(&info->lock,flags);
return;
spin_lock_irqsave(&info->lock,flags);
@@
-1649,7
+1652,7
@@
static int mgslpc_write(struct tty_struct * tty,
__FILE__,__LINE__,info->device_name,count);
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_write") ||
__FILE__,__LINE__,info->device_name,count);
if (mgslpc_paranoia_check(info, tty->name, "mgslpc_write") ||
-
!tty ||
!info->tx_buf)
+
!info->tx_buf)
goto cleanup;
if (info->params.mode == MGSL_MODE_HDLC) {
goto cleanup;
if (info->params.mode == MGSL_MODE_HDLC) {
@@
-3006,7
+3009,7
@@
static struct pcmcia_driver mgslpc_driver = {
.resume = mgslpc_resume,
};
.resume = mgslpc_resume,
};
-static struct tty_operations mgslpc_ops = {
+static
const
struct tty_operations mgslpc_ops = {
.open = mgslpc_open,
.close = mgslpc_close,
.write = mgslpc_write,
.open = mgslpc_open,
.close = mgslpc_close,
.write = mgslpc_write,
@@
-4251,8
+4254,10
@@
static int hdlcdev_open(struct net_device *dev)
spin_lock_irqsave(&info->lock, flags);
get_signals(info);
spin_unlock_irqrestore(&info->lock, flags);
spin_lock_irqsave(&info->lock, flags);
get_signals(info);
spin_unlock_irqrestore(&info->lock, flags);
- hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev);
-
+ if (info->serial_signals & SerialSignal_DCD)
+ netif_carrier_on(dev);
+ else
+ netif_carrier_off(dev);
return 0;
}
return 0;
}