Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26677
b: refs/heads/master
c: b33d079
h: refs/heads/master
i:
  26675: 2be0f74
v: v3
  • Loading branch information
Jean Delvare authored and Greg Kroah-Hartman committed May 9, 2006
1 parent 19732f4 commit e65783d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 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: 6f9c2963888e60e46a9e0bd09a25740abce29262
refs/heads/master: b33d0798e6cfae1fcee75afc808fe5690a48a814
6 changes: 1 addition & 5 deletions trunk/drivers/i2c/busses/scx200_acb.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ static int __init scx200_acb_create(const char *text, int base, int index)
struct scx200_acb_iface *iface;
struct i2c_adapter *adapter;
int rc;
char description[64];

iface = kzalloc(sizeof(*iface), GFP_KERNEL);
if (!iface) {
Expand All @@ -434,10 +433,7 @@ static int __init scx200_acb_create(const char *text, int base, int index)

mutex_init(&iface->mutex);

snprintf(description, sizeof(description), "%s ACCESS.bus [%s]",
text, adapter->name);

if (request_region(base, 8, description) == 0) {
if (!request_region(base, 8, adapter->name)) {
printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",
base, base + 8-1);
rc = -EBUSY;
Expand Down

0 comments on commit e65783d

Please sign in to comment.