diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-06-28 16:21:46 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-06-28 16:21:46 -0700 |
| commit | 17125e545a43ef8dbae6347557cdf46a89a8f63b (patch) | |
| tree | c85f3a06915ea90fd19d42b53e42eaa5fc1e45cc | |
| parent | e876dc150f80d4d1993357f2d89ed3e848ece736 (diff) | |
| parent | d1634cb25d1a7aa9b127087871eee649d58dcb05 (diff) | |
| download | syslinux-17125e545a43ef8dbae6347557cdf46a89a8f63b.tar.gz | |
Merge branch 'lwip' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux into lwip
| -rwxr-xr-x | extlinux/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extlinux/main.c b/extlinux/main.c index e5212a95..6aa6202d 100755 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start) if ((size_t)snprintf(sysfs_name, sizeof sysfs_name, "/sys/dev/block/%u:%u/start", - major(st.st_dev), minor(st.st_dev)) + major(st.st_rdev), minor(st.st_rdev)) >= sizeof sysfs_name) return -1; @@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct hd_geometry *geo) memset(geo, 0, sizeof *geo); - if (!ioctl(devfd, HDIO_GETGEO, &geo)) { + if (!ioctl(devfd, HDIO_GETGEO, geo)) { goto ok; } else if (!ioctl(devfd, FDGETPRM, &fd_str)) { geo->heads = fd_str.head; |