Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 307177
b: refs/heads/master
c: 3bf3f45
h: refs/heads/master
i:
  307175: 8583dbd
v: v3
  • Loading branch information
Ben Widawsky authored and Daniel Vetter committed Apr 18, 2012
1 parent 1f00e90 commit 0d00b2a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c43b5634037ff00c83cde4ab7fc5e46831c846ef
refs/heads/master: 3bf3f452362841404fe6d4589883f9471842ef8b
24 changes: 18 additions & 6 deletions trunk/drivers/gpu/drm/i915/intel_sdvo.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,17 @@ static const char *cmd_status_names[] = {
static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
const void *args, int args_len)
{
u8 buf[args_len*2 + 2], status;
struct i2c_msg msgs[args_len + 3];
int i, ret;
u8 *buf, status;
struct i2c_msg *msgs;
int i, ret = true;

buf = (u8 *)kzalloc(args_len * 2 + 2, GFP_KERNEL);
if (!buf)
return false;

msgs = kcalloc(args_len + 3, sizeof(*msgs), GFP_KERNEL);
if (!msgs)
return false;

intel_sdvo_debug_write(intel_sdvo, cmd, args, args_len);

Expand Down Expand Up @@ -479,15 +487,19 @@ static bool intel_sdvo_write_cmd(struct intel_sdvo *intel_sdvo, u8 cmd,
ret = i2c_transfer(intel_sdvo->i2c, msgs, i+3);
if (ret < 0) {
DRM_DEBUG_KMS("I2c transfer returned %d\n", ret);
return false;
ret = false;
goto out;
}
if (ret != i+3) {
/* failure in I2C transfer */
DRM_DEBUG_KMS("I2c transfer returned %d/%d\n", ret, i+3);
return false;
ret = false;
}

return true;
out:
kfree(msgs);
kfree(buf);
return ret;
}

static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
Expand Down

0 comments on commit 0d00b2a

Please sign in to comment.