summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-02-25 23:02:37 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-02-25 23:02:37 +0000
commit5ab35ec1b739c667e1879e8cebc968703c50719d (patch)
treebd81cdf952e0e384590450956a8dfffb265895be
parent0370bbb9826a63e4e98f8a3c94f8e41266e49bc6 (diff)
parent011429a837aabd31149f5641545b9d05a042d144 (diff)
Merge remote-tracking branch 'incubator/dde' into dde-upstream
-rw-r--r--libmachdev/net.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmachdev/net.c b/libmachdev/net.c
index 4b4cfe7c..501c9bb7 100644
--- a/libmachdev/net.c
+++ b/libmachdev/net.c
@@ -583,10 +583,10 @@ device_set_status(void *d, dev_flavor_t flavor, dev_status_t status,
{
if (flavor == NET_FLAGS)
{
- if (count != sizeof(short))
+ if (count != 1)
return D_INVALID_SIZE;
- short flags = *(short *) status;
+ int flags = *(int *) status;
struct net_data *net = (struct net_data *) d;
dev_change_flags (net->dev, flags);