diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
| commit | f341dddf1dadf64be309791f83d7904245f1261d (patch) | |
| tree | 974c9e1f23da6743532162fd86cf019da497eaff /drivers/staging/wlags49_h2/wl_netdev.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | Staging: Merge two branches of coding style fixes together (diff) | |
| download | linux-dev-f341dddf1dadf64be309791f83d7904245f1261d.tar.xz linux-dev-f341dddf1dadf64be309791f83d7904245f1261d.zip | |
Staging: merge staging patches into Linus's main branch
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_netdev.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index c33e225bc0e6..fa082d90fcad 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@ -360,7 +360,7 @@ int wl_open(struct net_device *dev) wl_lock( lp, &flags ); if( status != HCF_SUCCESS ) { - // Unsuccesfull, try reset of the card to recover + // Unsuccessful, try reset of the card to recover status = wl_reset( dev ); } |