diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/gameport/ns558.c | 1 | ||||
-rw-r--r-- | drivers/pnp/pnpbios/rsparser.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/gameport/ns558.c b/drivers/input/gameport/ns558.c index f68dbe6f7f04..7b7a546323cf 100644 --- a/drivers/input/gameport/ns558.c +++ b/drivers/input/gameport/ns558.c | |||
@@ -151,7 +151,6 @@ static int ns558_isa_probe(int io) | |||
151 | return -ENOMEM; | 151 | return -ENOMEM; |
152 | } | 152 | } |
153 | 153 | ||
154 | memset(ns558, 0, sizeof(struct ns558)); | ||
155 | ns558->io = io; | 154 | ns558->io = io; |
156 | ns558->size = 1 << i; | 155 | ns558->size = 1 << i; |
157 | ns558->gameport = port; | 156 | ns558->gameport = port; |
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index 95b79685a9d1..3c2ab8394e3f 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
@@ -530,7 +530,6 @@ pnpbios_parse_compatible_ids(unsigned char *p, unsigned char *end, struct pnp_de | |||
530 | dev_id = kzalloc(sizeof (struct pnp_id), GFP_KERNEL); | 530 | dev_id = kzalloc(sizeof (struct pnp_id), GFP_KERNEL); |
531 | if (!dev_id) | 531 | if (!dev_id) |
532 | return NULL; | 532 | return NULL; |
533 | memset(dev_id, 0, sizeof(struct pnp_id)); | ||
534 | pnpid32_to_pnpid(p[1] | p[2] << 8 | p[3] << 16 | p[4] << 24,id); | 533 | pnpid32_to_pnpid(p[1] | p[2] << 8 | p[3] << 16 | p[4] << 24,id); |
535 | memcpy(&dev_id->id, id, 7); | 534 | memcpy(&dev_id->id, id, 7); |
536 | pnp_add_id(dev_id, dev); | 535 | pnp_add_id(dev_id, dev); |