diff --git a/libnfc/buses/usbbus.c b/libnfc/buses/usbbus.c
index 6385d33..d8ea11b 100644
--- a/libnfc/buses/usbbus.c
+++ b/libnfc/buses/usbbus.c
@@ -682,7 +682,7 @@ int usbbus_get_string_simple(usbbus_dev_handle *dev, int index, char *buf, size_
 }
 
 static int usbbus_bulk_io(usbbus_dev_handle *dev, int ep, unsigned char *bytes,
-                       int size, int timeout)
+                          int size, int timeout)
 {
   int actual_length;
   int r;
@@ -730,7 +730,7 @@ int usbbus_release_interface(usbbus_dev_handle *dev, int interface)
 int usbbus_set_altinterface(usbbus_dev_handle *dev, int alternate)
 {
   if (dev->last_claimed_interface < 0)
-    return -(errno=EINVAL);
+    return -(errno = EINVAL);
   return compat_err(libusb_set_interface_alt_setting(dev->handle, dev->last_claimed_interface, alternate));
 }
 
diff --git a/libnfc/buses/usbbus.h b/libnfc/buses/usbbus.h
index 54b252b..2c1852f 100644
--- a/libnfc/buses/usbbus.h
+++ b/libnfc/buses/usbbus.h
@@ -131,7 +131,7 @@ struct usbbus_device_descriptor {
   uint8_t  iProduct;
   uint8_t  iSerialNumber;
   uint8_t  bNumConfigurations;
-} __attribute__((packed));
+};
 
 
 struct usbbus_bus;