libertas: if_sdio: fix buffer alignment in struct if_sdio_card
authorMike Rapoport <mike@compulab.co.il>
Sun, 22 Aug 2010 11:22:40 +0000 (14:22 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Aug 2010 17:13:11 +0000 (13:13 -0400)
The commit 886275ce41a9751117367fb387ed171049eb6148 (param: lock
if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes)
introduced new fields into the if_sdio_card structure. It caused
missalignment of the if_sdio_card.buffer field and failure at driver
load time:

  ~# modprobe libertas_sdio
  [   62.315124] libertas_sdio: Libertas SDIO driver
  [   62.319976] libertas_sdio: Copyright Pierre Ossman
  [   63.020629] DMA misaligned error with device 48
  [   63.025207] mmci-omap-hs mmci-omap-hs.1: unexpected dma status 800
  [   66.005035] libertas: command 0x0003 timed out
  [   66.009826] libertas: Timeout submitting command 0x0003
  [   66.016296] libertas: PREP_CMD: command 0x0003 failed: -110

Adding explicit alignment attribute for the if_sdio_card.buffer field
fixes this problem.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/libertas/if_sdio.c

index 6e71346a75505a4398964a2889eef4803822f5a4..382f2371a1ab53ccef6c1d4f102230c3e2b8745f 100644 (file)
@@ -126,7 +126,7 @@ struct if_sdio_card {
        const char              *helper;
        const char              *firmware;
 
-       u8                      buffer[65536];
+       u8                      buffer[65536] __attribute__((aligned(4)));
 
        spinlock_t              lock;
        struct if_sdio_packet   *packets;