From b2a1df559d25ff35a48920c069c7a9879db00284 Mon Sep 17 00:00:00 2001 From: Jens Taprogge Date: Tue, 11 Sep 2012 13:34:57 +0200 Subject: [PATCH] --- yaml --- r: 325165 b: refs/heads/master c: 0b0f3a1bee7f321b92ffc37d8b32d1ce412a285c h: refs/heads/master i: 325163: e07542ed4aac139211db3259dd0c862fbd371ee7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/ipack.c | 6 ++++++ trunk/drivers/staging/ipack/ipack.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dd637ee4f051..5b4787181c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb12d88bf5f07a5aac77bebdfcb8a77ade48964e +refs/heads/master: 0b0f3a1bee7f321b92ffc37d8b32d1ce412a285c diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c index af47772da515..c36ba9ee7ef1 100644 --- a/trunk/drivers/staging/ipack/ipack.c +++ b/trunk/drivers/staging/ipack/ipack.c @@ -262,15 +262,21 @@ static void ipack_parse_id1(struct ipack_device *dev) dev->id_vendor = id[4]; dev->id_device = id[5]; + dev->speed_8mhz = 1; + dev->speed_32mhz = (id[7] == 'H'); } static void ipack_parse_id2(struct ipack_device *dev) { __be16 *id = (__be16 *) dev->id; + u16 flags; dev->id_vendor = ((be16_to_cpu(id[3]) & 0xff) << 16) + be16_to_cpu(id[4]); dev->id_device = be16_to_cpu(id[5]); + flags = be16_to_cpu(id[10]); + dev->speed_8mhz = !!(flags & 2); + dev->speed_32mhz = !!(flags & 4); } static int ipack_device_read_id(struct ipack_device *dev) diff --git a/trunk/drivers/staging/ipack/ipack.h b/trunk/drivers/staging/ipack/ipack.h index a13330423389..89af9e4ee0dc 100644 --- a/trunk/drivers/staging/ipack/ipack.h +++ b/trunk/drivers/staging/ipack/ipack.h @@ -79,6 +79,8 @@ struct ipack_device { u32 id_vendor; u32 id_device; u8 id_format; + unsigned int speed_8mhz:1; + unsigned int speed_32mhz:1; }; /**