From b4b7ff4b08e691656c9d77c758fc355833128ac0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 20 Jan 2016 14:01:31 -0300 Subject: Linux-libre 4.4-gnu --- drivers/staging/gdm72xx/gdm_wimax.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'drivers/staging/gdm72xx/gdm_wimax.c') diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 08290d901..d9ddced96 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -62,7 +62,7 @@ static inline int gdm_wimax_header(struct sk_buff **pskb) struct sk_buff *skb2; skb2 = skb_realloc_headroom(skb, HCI_HEADER_SIZE); - if (skb2 == NULL) + if (!skb2) return -ENOMEM; if (skb->sk) skb_set_owner_w(skb2, skb->sk); @@ -339,7 +339,7 @@ static void gdm_wimax_ind_if_updown(struct net_device *dev, int if_up) static int gdm_wimax_open(struct net_device *dev) { struct nic *nic = netdev_priv(dev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; netif_start_queue(dev); @@ -351,7 +351,7 @@ static int gdm_wimax_open(struct net_device *dev) static int gdm_wimax_close(struct net_device *dev) { struct nic *nic = netdev_priv(dev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; netif_stop_queue(dev); @@ -378,7 +378,7 @@ static int gdm_wimax_ioctl_get_data(struct data_s *dst, struct data_s *src) if (src->size) { if (!dst->buf) return -EINVAL; - if (copy_to_user((void __user *)dst->buf, src->buf, size)) + if (copy_to_user(dst->buf, src->buf, size)) return -EFAULT; } return 0; @@ -397,11 +397,11 @@ static int gdm_wimax_ioctl_set_data(struct data_s *dst, struct data_s *src) if (!(dst->buf && dst->size == src->size)) { kdelete(&dst->buf); dst->buf = kmalloc(src->size, GFP_KERNEL); - if (dst->buf == NULL) + if (!dst->buf) return -ENOMEM; } - if (copy_from_user(dst->buf, (void __user *)src->buf, src->size)) { + if (copy_from_user(dst->buf, src->buf, src->size)) { kdelete(&dst->buf); return -EFAULT; } @@ -435,7 +435,7 @@ static void gdm_wimax_ind_fsm_update(struct net_device *dev, struct fsm_s *fsm) static void gdm_update_fsm(struct net_device *dev, struct fsm_s *new_fsm) { struct nic *nic = netdev_priv(dev); - struct fsm_s *cur_fsm = (struct fsm_s *) + struct fsm_s *cur_fsm = nic->sdk_data[SIOC_DATA_FSM].buf; if (!cur_fsm) @@ -483,7 +483,7 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) * before gdm_wimax_ioctl_set_data is called. */ gdm_update_fsm(dev, - (struct fsm_s *)req->data.buf); + req->data.buf); } ret = gdm_wimax_ioctl_set_data( &nic->sdk_data[req->data_id], &req->data); @@ -581,8 +581,8 @@ static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf, } pos += gdm_wimax_hci_get_tlv(&buf[pos], &T, &L, &V); - if (T == TLV_T(T_MAC_ADDRESS)) { - if (L != dev->addr_len) { + if (TLV_T(T_MAC_ADDRESS) == T) { + if (dev->addr_len != L) { netdev_err(dev, "%s Invalid information result T/L [%x/%d]\n", __func__, T, L); @@ -798,7 +798,7 @@ cleanup: void unregister_wimax_device(struct phy_dev *phy_dev) { struct nic *nic = netdev_priv(phy_dev->netdev); - struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf; + struct fsm_s *fsm = nic->sdk_data[SIOC_DATA_FSM].buf; if (fsm) fsm->m_status = M_INIT; -- cgit v1.2.3-54-g00ecf