diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-25 16:57:42 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-10-01 15:03:38 -0500 |
| commit | 7b75b990e3cb33fd529640d589e77950e72a607c (patch) | |
| tree | 1e282b2af06644587687f02d86419f604d87a907 /drivers/scsi/aic7xxx/aic7xxx_inline.h | |
| parent | 02a0fa676cd453ce4254c2eee838307ffc5c37f4 (diff) | |
| download | linux-7b75b990e3cb33fd529640d589e77950e72a607c.tar.gz | |
[SCSI] aic7xxx: fix byte I/O order in ahd_inw
Comment says "Read high byte first as some registers increment..." but code doesn't guarantee that, I think: return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port)); Compiler can reorder it. Make the order explicit. Signed-off-by: Denis Vlasenko <vda.linux@googlemail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Fixed rejections and added aic7xxx code Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_inline.h')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_inline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_inline.h b/drivers/scsi/aic7xxx/aic7xxx_inline.h index 2cc8a17ed8b4..8e1954cdd84f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_inline.h +++ b/drivers/scsi/aic7xxx/aic7xxx_inline.h @@ -300,7 +300,8 @@ ahc_fetch_transinfo(struct ahc_softc *ahc, char channel, u_int our_id, static __inline uint16_t ahc_inw(struct ahc_softc *ahc, u_int port) { - return ((ahc_inb(ahc, port+1) << 8) | ahc_inb(ahc, port)); + uint16_t r = ahc_inb(ahc, port+1) << 8; + return r | ahc_inb(ahc, port); } static __inline void |