Merge branch 'master' into upstream-fixes

1 files changed, 4 insertions, 4 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index b400f27851fc..3bcdb467efc5 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -379,12 +379,11 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         self = hashbin_lock_find(ircomm_tty, line, NULL);
         if (!self) {
                 /* No, so make new instance */
-                self = kmalloc(sizeof(struct ircomm_tty_cb), GFP_KERNEL);
+                self = kzalloc(sizeof(struct ircomm_tty_cb), GFP_KERNEL);
                 if (self == NULL) {
                         IRDA_ERROR("%s(), kmalloc failed!\n", __FUNCTION__);
                         return -ENOMEM;
                 }
-                memset(self, 0, sizeof(struct ircomm_tty_cb));
                 
                 self->magic = IRCOMM_TTY_MAGIC;
                 self->flow = FLOW_STOP;
@@ -759,8 +758,9 @@ static int ircomm_tty_write(struct tty_struct *tty,
                         }
                 } else {
                         /* Prepare a full sized frame */
-                        skb = dev_alloc_skb(self->max_data_size+
-                                            self->max_header_size);
+                        skb = alloc_skb(self->max_data_size+
+                                        self->max_header_size,
+                                        GFP_ATOMIC);
                         if (!skb) {
                                 spin_unlock_irqrestore(&self->spinlock, flags);
                                 return -ENOBUFS;