diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/ide/ide-taskfile.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
| -rw-r--r-- | drivers/ide/ide-taskfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 9233b8109a0f..a839b2a8f6f4 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
| @@ -196,8 +196,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive) | |||
| 196 | if (stat & (ERR_STAT|DRQ_STAT)) | 196 | if (stat & (ERR_STAT|DRQ_STAT)) |
| 197 | return ide_error(drive, "set_geometry_intr", stat); | 197 | return ide_error(drive, "set_geometry_intr", stat); |
| 198 | 198 | ||
| 199 | if (HWGROUP(drive)->handler != NULL) | 199 | BUG_ON(HWGROUP(drive)->handler != NULL); |
| 200 | BUG(); | ||
| 201 | ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL); | 200 | ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL); |
| 202 | return ide_started; | 201 | return ide_started; |
| 203 | } | 202 | } |