diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /drivers/net/wireless/b43/phy.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/wireless/b43/phy.c')
| -rw-r--r-- | drivers/net/wireless/b43/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy.c b/drivers/net/wireless/b43/phy.c index 3d4ed647c311..7ff091e69f05 100644 --- a/drivers/net/wireless/b43/phy.c +++ b/drivers/net/wireless/b43/phy.c | |||
| @@ -2214,7 +2214,7 @@ int b43_phy_init_tssi2dbm_table(struct b43_wldev *dev) | |||
| 2214 | } | 2214 | } |
| 2215 | dyn_tssi2dbm = kmalloc(64, GFP_KERNEL); | 2215 | dyn_tssi2dbm = kmalloc(64, GFP_KERNEL); |
| 2216 | if (dyn_tssi2dbm == NULL) { | 2216 | if (dyn_tssi2dbm == NULL) { |
| 2217 | b43err(dev->wl, "Could not allocate memory" | 2217 | b43err(dev->wl, "Could not allocate memory " |
| 2218 | "for tssi2dbm table\n"); | 2218 | "for tssi2dbm table\n"); |
| 2219 | return -ENOMEM; | 2219 | return -ENOMEM; |
| 2220 | } | 2220 | } |