]>
Commit | Line | Data |
---|---|---|
5d868a17 JR |
1 | --- linux-2.4.21/drivers/ide/ide-disk.c~ Fri Jun 13 16:51:33 2003 |
2 | +++ linux-2.4.21/drivers/ide/ide-disk.c Sun Jun 29 18:48:33 2003 | |
3 | @@ -698,12 +698,9 @@ | |
4 | { | |
5 | ide_hwif_t *hwif = HWIF(drive); | |
6 | if (hwif->rw_disk) | |
7 | - return hwif->rw_disk(drive, rq, block); | |
8 | - else | |
9 | - return __ide_do_rw_disk(drive, rq, block); | |
10 | + hwif->rw_disk(drive, rq, block); | |
11 | + return __ide_do_rw_disk(drive, rq, block); | |
12 | } | |
13 | - | |
14 | -EXPORT_SYMBOL_GPL(__ide_do_rw_disk); | |
15 | ||
16 | static int idedisk_open (struct inode *inode, struct file *filp, ide_drive_t *drive) | |
17 | { | |
18 | --- linux-2.4.21/drivers/ide/pci/hpt366.c~ Sun Jun 29 15:09:43 2003 | |
19 | +++ linux-2.4.21/drivers/ide/pci/hpt366.c Sun Jun 29 18:50:33 2003 | |
20 | @@ -742,7 +742,7 @@ | |
21 | hpt372n_set_clock(drive, wantclock); | |
22 | HWIF(drive)->config_data = wantclock; | |
23 | } | |
24 | - return __ide_do_rw_disk(drive, rq, block); | |
25 | + return ide_started; | |
26 | } | |
27 | ||
28 | /* |