[aadk-commits] qwell: branch uClinux/upstreamsync r377 - /uClinux/branches/upstreamsync/uCli...

[aadk-commits at lists.digium.com]

Author: qwell
Date: Tue Apr 24 10:41:01 2007
New Revision: 377

URL: http://svn.digium.com/view/aadk?view=rev&rev=377
Log:
Make sure we align a value properly when we use it.

This was a regression upstream.  I thought I had already committed this, but I guess not...

Modified:
    uClinux/branches/upstreamsync/uClinux-dist/linux-2.6.x/drivers/pcmcia/cistpl.c

Modified: uClinux/branches/upstreamsync/uClinux-dist/linux-2.6.x/drivers/pcmcia/cistpl.c
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/linux-2.6.x/drivers/pcmcia/cistpl.c?view=diff&rev=377&r1=376&r2=377
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/linux-2.6.x/drivers/pcmcia/cistpl.c (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/linux-2.6.x/drivers/pcmcia/cistpl.c Tue Apr 24 10:41:01 2007
@@ -1093,7 +1093,7 @@
 	break;
     case 0x20:
 	entry->mem.nwin = 1;
-	entry->mem.win[0].len = le16_to_cpu(*(__le16 *)p) << 8;
+	entry->mem.win[0].len = le16_to_cpu(get_unaligned((__le16 *)p)) << 8;
 	entry->mem.win[0].card_addr = 0;
 	entry->mem.win[0].host_addr = 0;
 	p += 2;