Commit 748a8981 authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[IRDA]: Do not use lvalue in assignment.

parent 66726f3d
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define CONTROL_BIT 0x80 #define CONTROL_BIT 0x80
inline void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap, void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
int expedited, struct sk_buff *skb); int expedited, struct sk_buff *skb);
void irlmp_send_lcf_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap, void irlmp_send_lcf_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
__u8 opcode, struct sk_buff *skb); __u8 opcode, struct sk_buff *skb);
......
...@@ -74,19 +74,19 @@ typedef void (*TIMER_CALLBACK)(void *); ...@@ -74,19 +74,19 @@ typedef void (*TIMER_CALLBACK)(void *);
void irda_start_timer(struct timer_list *ptimer, int timeout, void* data, void irda_start_timer(struct timer_list *ptimer, int timeout, void* data,
TIMER_CALLBACK callback); TIMER_CALLBACK callback);
inline void irlap_start_slot_timer(struct irlap_cb *self, int timeout); void irlap_start_slot_timer(struct irlap_cb *self, int timeout);
inline void irlap_start_query_timer(struct irlap_cb *self, int timeout); void irlap_start_query_timer(struct irlap_cb *self, int timeout);
inline void irlap_start_final_timer(struct irlap_cb *self, int timeout); void irlap_start_final_timer(struct irlap_cb *self, int timeout);
inline void irlap_start_wd_timer(struct irlap_cb *self, int timeout); void irlap_start_wd_timer(struct irlap_cb *self, int timeout);
inline void irlap_start_backoff_timer(struct irlap_cb *self, int timeout); void irlap_start_backoff_timer(struct irlap_cb *self, int timeout);
void irlap_start_mbusy_timer(struct irlap_cb *self, int timeout); void irlap_start_mbusy_timer(struct irlap_cb *self, int timeout);
void irlap_stop_mbusy_timer(struct irlap_cb *); void irlap_stop_mbusy_timer(struct irlap_cb *);
inline void irlmp_start_watchdog_timer(struct lsap_cb *, int timeout); void irlmp_start_watchdog_timer(struct lsap_cb *, int timeout);
inline void irlmp_start_discovery_timer(struct irlmp_cb *, int timeout); void irlmp_start_discovery_timer(struct irlmp_cb *, int timeout);
inline void irlmp_start_idle_timer(struct lap_cb *, int timeout); void irlmp_start_idle_timer(struct lap_cb *, int timeout);
inline void irlmp_stop_idle_timer(struct lap_cb *self); void irlmp_stop_idle_timer(struct lap_cb *self);
#endif #endif
...@@ -1089,7 +1089,7 @@ static int irda_create(struct socket *sock, int protocol) ...@@ -1089,7 +1089,7 @@ static int irda_create(struct socket *sock, int protocol)
return -ENOMEM; return -ENOMEM;
/* Allocate IrDA socket */ /* Allocate IrDA socket */
self = irda_sk(sk) = kmalloc(sizeof(struct irda_sock), GFP_ATOMIC); self = sk->sk_protinfo = kmalloc(sizeof(struct irda_sock), GFP_ATOMIC);
if (self == NULL) { if (self == NULL) {
sk_free(sk); sk_free(sk);
return -ENOMEM; return -ENOMEM;
...@@ -1208,7 +1208,7 @@ static int irda_release(struct socket *sock) ...@@ -1208,7 +1208,7 @@ static int irda_release(struct socket *sock)
/* Destroy IrDA socket */ /* Destroy IrDA socket */
irda_destroy_socket(irda_sk(sk)); irda_destroy_socket(irda_sk(sk));
/* Prevent sock_def_destruct() to create havoc */ /* Prevent sock_def_destruct() to create havoc */
irda_sk(sk) = NULL; sk->sk_protinfo = NULL;
sock_orphan(sk); sock_orphan(sk);
sock->sk = NULL; sock->sk = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment