diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:16:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 11:16:37 -0400 |
| commit | 13bbd8d90647132fc295d73b122567eb8987d298 (patch) | |
| tree | 466ae1f00a5965308ce2e7695d4bfe88d87b9610 /drivers/block | |
| parent | 18e6756a6b463e09fd3873592ec6b0579c78103d (diff) | |
| parent | 9020fc960b8f5fbca0de6e4d11881ddc827aa61d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (25 commits)
[POWERPC] Add support for the mpc832x mds board
[POWERPC] Add initial support for the e300c2 core
[POWERPC] Add MPC8360EMDS default dts file
[POWERPC] Add MPC8360EMDS board support
[POWERPC] Add QUICC Engine (QE) infrastructure
[POWERPC] Add QE device tree node definition
[POWERPC] Don't try to just continue if xmon has no input device
[POWERPC] Fix a printk in pseries_mpic_init_IRQ
[POWERPC] Get default baud rate in udbg_scc
[POWERPC] Fix zImage.coff on oldworld PowerMac
[POWERPC] Fix xmon=off and cleanup xmon initialisation
[POWERPC] Cleanup include/asm-powerpc/xmon.h
[POWERPC] Update swim3 printk after blkdev.h change
[POWERPC] Cell interrupt rework
POWERPC: mpc82xx merge: board-specific/platform stuff(resend)
POWERPC: 8272ads merge to powerpc: common stuff
POWERPC: Added devicetree for mpc8272ads board
[POWERPC] iSeries has no legacy I/O
[POWERPC] implement BEGIN/END_FW_FTR_SECTION
[POWERPC] iSeries does not need pcibios_fixup_resources
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/swim3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index f2305ee792a1..fdc8f892eb86 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
| @@ -636,7 +636,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 636 | intr = in_8(&sw->intr); | 636 | intr = in_8(&sw->intr); |
| 637 | err = (intr & ERROR_INTR)? in_8(&sw->error): 0; | 637 | err = (intr & ERROR_INTR)? in_8(&sw->error): 0; |
| 638 | if ((intr & ERROR_INTR) && fs->state != do_transfer) | 638 | if ((intr & ERROR_INTR) && fs->state != do_transfer) |
| 639 | printk(KERN_ERR "swim3_interrupt, state=%d, dir=%lx, intr=%x, err=%x\n", | 639 | printk(KERN_ERR "swim3_interrupt, state=%d, dir=%x, intr=%x, err=%x\n", |
| 640 | fs->state, rq_data_dir(fd_req), intr, err); | 640 | fs->state, rq_data_dir(fd_req), intr, err); |
| 641 | switch (fs->state) { | 641 | switch (fs->state) { |
| 642 | case locating: | 642 | case locating: |
| @@ -742,7 +742,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 742 | if ((stat & ACTIVE) == 0 || resid != 0) { | 742 | if ((stat & ACTIVE) == 0 || resid != 0) { |
| 743 | /* musta been an error */ | 743 | /* musta been an error */ |
| 744 | printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid); | 744 | printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid); |
| 745 | printk(KERN_ERR " state=%d, dir=%lx, intr=%x, err=%x\n", | 745 | printk(KERN_ERR " state=%d, dir=%x, intr=%x, err=%x\n", |
| 746 | fs->state, rq_data_dir(fd_req), intr, err); | 746 | fs->state, rq_data_dir(fd_req), intr, err); |
| 747 | end_request(fd_req, 0); | 747 | end_request(fd_req, 0); |
| 748 | fs->state = idle; | 748 | fs->state = idle; |