diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /net/irda/irlap.c | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'net/irda/irlap.c')
| -rw-r--r-- | net/irda/irlap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/irda/irlap.c b/net/irda/irlap.c index 7029618f5719..a16528657b4c 100644 --- a/net/irda/irlap.c +++ b/net/irda/irlap.c | |||
| @@ -884,7 +884,8 @@ static void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now) | |||
| 884 | if (now) { | 884 | if (now) { |
| 885 | /* Send down empty frame to trigger speed change */ | 885 | /* Send down empty frame to trigger speed change */ |
| 886 | skb = dev_alloc_skb(0); | 886 | skb = dev_alloc_skb(0); |
| 887 | irlap_queue_xmit(self, skb); | 887 | if (skb) |
| 888 | irlap_queue_xmit(self, skb); | ||
| 888 | } | 889 | } |
| 889 | } | 890 | } |
| 890 | 891 | ||