diff --git a/[refs] b/[refs] index 09e42a947c86..69790f7cd6ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0af11fa0df30bc645e6abb4d3ddc7ed05af0451 +refs/heads/master: 52f2eaeec11c16c219f0e99b8496fbba86889830 diff --git a/trunk/drivers/nfc/pn533.c b/trunk/drivers/nfc/pn533.c index bd5c41b481d3..f0f6763d67ae 100644 --- a/trunk/drivers/nfc/pn533.c +++ b/trunk/drivers/nfc/pn533.c @@ -1378,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);