Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 874934f4 authored by Szymon Janc's avatar Szymon Janc Committed by Samuel Ortiz
Browse files

NFC: Fix style issues with logical operations 



Logical continuations should be on the previous line.

Signed-off-by: default avatarSzymon Janc <szymon.janc@tieto.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 0250ffc5

net/nfc/llcp/sock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -205,8 +205,8 @@ static int llcp_sock_listen(struct socket *sock, int backlog) 




	lock_sock(sk);

	lock_sock(sk);





	if ((sock->type != SOCK_SEQPACKET && sock->type != SOCK_STREAM)

	if ((sock->type != SOCK_SEQPACKET && sock->type != SOCK_STREAM) ||

	    || sk->sk_state != LLCP_BOUND) {

	    sk->sk_state != LLCP_BOUND) {

		ret = -EBADFD;

		ret = -EBADFD;

		goto error;

		goto error;

	}

	}

net/nfc/nci/core.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -205,10 +205,10 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt) 
	cmd.num_disc_configs = 0;

	cmd.num_disc_configs = 0;





	if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&

	if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&

	    (protocols & NFC_PROTO_JEWEL_MASK

	    (protocols & NFC_PROTO_JEWEL_MASK ||

	     || protocols & NFC_PROTO_MIFARE_MASK

	     protocols & NFC_PROTO_MIFARE_MASK ||

	     || protocols & NFC_PROTO_ISO14443_MASK

	     protocols & NFC_PROTO_ISO14443_MASK ||

	     || protocols & NFC_PROTO_NFC_DEP_MASK)) {

	     protocols & NFC_PROTO_NFC_DEP_MASK)) {

		cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =

		cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =

			NCI_NFC_A_PASSIVE_POLL_MODE;

			NCI_NFC_A_PASSIVE_POLL_MODE;

		cmd.disc_configs[cmd.num_disc_configs].frequency = 1;

		cmd.disc_configs[cmd.num_disc_configs].frequency = 1;
@@ -224,8 +224,8 @@ static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt) 
	}

	}





	if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&

	if ((cmd.num_disc_configs < NCI_MAX_NUM_RF_CONFIGS) &&

	    (protocols & NFC_PROTO_FELICA_MASK

	    (protocols & NFC_PROTO_FELICA_MASK ||

	     || protocols & NFC_PROTO_NFC_DEP_MASK)) {

	     protocols & NFC_PROTO_NFC_DEP_MASK)) {

		cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =

		cmd.disc_configs[cmd.num_disc_configs].rf_tech_and_mode =

			NCI_NFC_F_PASSIVE_POLL_MODE;

			NCI_NFC_F_PASSIVE_POLL_MODE;

		cmd.disc_configs[cmd.num_disc_configs].frequency = 1;

		cmd.disc_configs[cmd.num_disc_configs].frequency = 1;
@@ -804,8 +804,8 @@ int nci_recv_frame(struct sk_buff *skb) 




	pr_debug("len %d\n", skb->len);

	pr_debug("len %d\n", skb->len);





	if (!ndev || (!test_bit(NCI_UP, &ndev->flags)

	if (!ndev || (!test_bit(NCI_UP, &ndev->flags) &&

		      && !test_bit(NCI_INIT, &ndev->flags))) {

	    !test_bit(NCI_INIT, &ndev->flags))) {

		kfree_skb(skb);

		kfree_skb(skb);

		return -ENXIO;

		return -ENXIO;

	}

	}