diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/scsi/aic7xxx/aic7xxx_inline.h | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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, | |||
| 300 | static __inline uint16_t | 300 | static __inline uint16_t |
| 301 | ahc_inw(struct ahc_softc *ahc, u_int port) | 301 | ahc_inw(struct ahc_softc *ahc, u_int port) |
| 302 | { | 302 | { |
| 303 | return ((ahc_inb(ahc, port+1) << 8) | ahc_inb(ahc, port)); | 303 | uint16_t r = ahc_inb(ahc, port+1) << 8; |
| 304 | return r | ahc_inb(ahc, port); | ||
| 304 | } | 305 | } |
| 305 | 306 | ||
| 306 | static __inline void | 307 | static __inline void |