Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / go7007 / s2250-board.c

diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index fb6845e37884da7202a79271943baeb4608c578f..d333ea2cd774219fc7bcdc6e299bcfe89901abda 100644 (file)
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/go7007/s2250-board.c
@@ -149,7 +149,7 @@ static int go7007_usb_vendor_request(struct go7007 *go, u16 request,
 static int write_reg(struct i2c_client *client, u8 reg, u8 value)
 {
        struct go7007 *go = i2c_get_adapdata(client->adapter);
-       struct go7007_usb *usb = go->hpi_context;
+       struct go7007_usb *usb;
        int rc;
        int dev_addr = client->addr;
        u8 *buf;
@@ -164,8 +164,10 @@ static int write_reg(struct i2c_client *client, u8 reg, u8 value)
        if (buf == NULL)
                return -ENOMEM;
 
+       usb = go->hpi_context;
        if (down_interruptible(&usb->i2c_lock) != 0) {
                printk(KERN_INFO "i2c lock failed\n");
+               kfree(buf);
                return -EINTR;
        }
        rc = go7007_usb_vendor_request(go, 0x55, dev_addr,
@@ -181,7 +183,7 @@ static int write_reg(struct i2c_client *client, u8 reg, u8 value)
 static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
 {
        struct go7007 *go = i2c_get_adapdata(client->adapter);
-       struct go7007_usb *usb = go->hpi_context;
+       struct go7007_usb *usb;
        u8 *buf;
        struct s2250 *dec = i2c_get_clientdata(client);
 
@@ -200,6 +202,7 @@ static int write_reg_fp(struct i2c_client *client, u16 addr, u16 val)
 
        memset(buf, 0xcd, 6);
 
+       usb = go->hpi_context;
        if (down_interruptible(&usb->i2c_lock) != 0) {
                printk(KERN_INFO "i2c lock failed\n");
                return -EINTR;