Merge branch 'pm-cpufreq' into fixes

[karo-tx-linux.git] / drivers / nfc / pn533.c

diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 0d7caf782571febb24fbe2bc672586311183f1e7..f0f6763d67aefcf73dc7b87e118ebb42bef649f6 100644 (file)
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -532,7 +532,6 @@ static void pn533_recv_response(struct urb *urb)
                            urb->status);
                dev->wq_in_error = urb->status;
                goto sched_wq;
-               break;
        case -ESHUTDOWN:
        default:
                nfc_dev_err(&dev->interface->dev,
@@ -589,7 +588,6 @@ static void pn533_recv_ack(struct urb *urb)
                            urb->status);
                dev->wq_in_error = urb->status;
                goto sched_wq;
-               break;
        case -ESHUTDOWN:
        default:
                nfc_dev_err(&dev->interface->dev,
@@ -1380,7 +1378,7 @@ static struct sk_buff *pn533_alloc_poll_tg_frame(struct pn533 *dev)
                return NULL;
 
        /* DEP support only */
-       *skb_put(skb, 1) |= PN533_INIT_TARGET_DEP;
+       *skb_put(skb, 1) = PN533_INIT_TARGET_DEP;
 
        /* MIFARE params */
        memcpy(skb_put(skb, 6), mifare_params, 6);