Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187131
b: refs/heads/master
c: a0a52d6
h: refs/heads/master
i:
  187129: f8e9a72
  187127: 7f4d5e3
v: v3
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 12, 2010
1 parent 841f593 commit 6d78083
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da27365342868df88fdd5c217bf68ec10b14b5f0
refs/heads/master: a0a52d67de6da21db0e549e38749b7a00029fea3
8 changes: 4 additions & 4 deletions trunk/drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ static inline void set_debugt(void) { }
static inline void debugt(const char *message) { }
#endif /* DEBUGT */

typedef void (*timeout_fn) (unsigned long);
typedef void (*timeout_fn)(unsigned long);
static DEFINE_TIMER(fd_timeout, floppy_shutdown, 0, 0);

static const char *timeout_message;
Expand Down Expand Up @@ -1036,7 +1036,7 @@ static void fd_watchdog(void)
reset_fdc();
} else {
del_timer(&fd_timer);
fd_timer.function = (timeout_fn) fd_watchdog;
fd_timer.function = (timeout_fn)fd_watchdog;
fd_timer.expires = jiffies + HZ / 10;
add_timer(&fd_timer);
}
Expand Down Expand Up @@ -1534,9 +1534,9 @@ static void setup_rw_floppy(void)
*/
if (time_after(ready_date, jiffies + DP->select_delay)) {
ready_date -= DP->select_delay;
function = (timeout_fn) floppy_start;
function = (timeout_fn)floppy_start;
} else
function = (timeout_fn) setup_rw_floppy;
function = (timeout_fn)setup_rw_floppy;

/* wait until the floppy is spinning fast enough */
if (fd_wait_for_completion(ready_date, function))
Expand Down

0 comments on commit 6d78083

Please sign in to comment.