merge mainline into hints

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-24 02:52:43 +01:00
commit 2b5c1a0810
6 changed files with 53 additions and 18 deletions

View file

@ -245,7 +245,7 @@ of_path_of_ide(char *of_path,
p = get_basename (sysfs_path);
sscanf(p, "%d.%d", &chan, &devno);
ret = __of_path_common(of_path, sysfs_path, device, devno);
ret = __of_path_common(of_path, sysfs_path, device, 2 * chan + devno);
free (sysfs_path);
return ret;