Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228345
b: refs/heads/master
c: 92914cc
h: refs/heads/master
i:
  228343: fc7edd6
v: v3
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent 0158407 commit 768e146
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 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: 1c46282421c8b31b37323f7b007c4562ce17578c
refs/heads/master: 92914cc8bb6d2d710d102051c9bb7566b0ac75a0
31 changes: 15 additions & 16 deletions trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,30 +166,29 @@ ft1000ReadProc (char *page, char **start, off_t off, int count, int *eof,
}

static int
ft1000NotifyProc (struct notifier_block *this, unsigned long event, void *ptr)
ft1000NotifyProc(struct notifier_block *this, unsigned long event, void *ptr)
{
struct net_device *dev = ptr;
struct net_device *dev = ptr;
struct ft1000_info *info;
struct proc_dir_entry *ft1000_proc_file;
struct proc_dir_entry *ft1000_proc_file;

info = netdev_priv(dev);
info = netdev_priv(dev);

switch (event) {
case NETDEV_CHANGENAME:
remove_proc_entry(info->netdevname, info->ft1000_proc_dir);
ft1000_proc_file = create_proc_read_entry(dev->name, 0644,
info->ft1000_proc_dir,
ft1000ReadProc, dev);
snprintf(info->netdevname, IFNAMSIZ, "%s", dev->name);
break;
}

switch (event)
{
case NETDEV_CHANGENAME:
remove_proc_entry (info->netdevname, info->ft1000_proc_dir);
ft1000_proc_file = create_proc_read_entry (dev->name, 0644,
info->ft1000_proc_dir,
ft1000ReadProc, dev);
snprintf (info->netdevname, IFNAMSIZ, "%s", dev->name);
break;
}
return NOTIFY_DONE;
return NOTIFY_DONE;
}

static struct notifier_block ft1000_netdev_notifier = {
.notifier_call = ft1000NotifyProc
.notifier_call = ft1000NotifyProc,
};


Expand Down

0 comments on commit 768e146

Please sign in to comment.