X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnfc%2Fmei_phy.c;h=606bf55e76ec5941bf69443f8113a38266b4c000;hb=8bd7fc89958c2f23a5c5d0113ff65713683041ea;hp=1201bdbfb7918175bc22ae2b1741174b7fbe977c;hpb=98f486f18d16e2214728d101ed8b6a12dce75539;p=~andy%2Flinux diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c index 1201bdbfb79..606bf55e76e 100644 --- a/drivers/nfc/mei_phy.c +++ b/drivers/nfc/mei_phy.c @@ -30,7 +30,7 @@ struct mei_nfc_hdr { u16 req_id; u32 reserved; u16 data_size; -} __attribute__((packed)); +} __packed; #define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD) @@ -60,8 +60,8 @@ int nfc_mei_phy_enable(void *phy_id) r = mei_cl_enable_device(phy->device); if (r < 0) { - pr_err("MEI_PHY: Could not enable device\n"); - return r; + pr_err("MEI_PHY: Could not enable device\n"); + return r; } r = mei_cl_register_event_cb(phy->device, nfc_mei_event_cb, phy);