diff --git a/[refs] b/[refs] index ecf29266904c..ca473092d914 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bc18091a5e44a368827f539289b99788eb27d4e +refs/heads/master: 8c893ff6abbac0c7c05b1cb9bfb6e2dfc4538c75 diff --git a/trunk/net/irda/irlap.c b/trunk/net/irda/irlap.c index 7029618f5719..a16528657b4c 100644 --- a/trunk/net/irda/irlap.c +++ b/trunk/net/irda/irlap.c @@ -884,7 +884,8 @@ static void irlap_change_speed(struct irlap_cb *self, __u32 speed, int now) if (now) { /* Send down empty frame to trigger speed change */ skb = dev_alloc_skb(0); - irlap_queue_xmit(self, skb); + if (skb) + irlap_queue_xmit(self, skb); } }