Permalink
Browse files

Fixing some patches that were made for GCC 4.8

Signed-off-by: Bryan Smith <zarboz@gmail.com>
  • Loading branch information...
1 parent d606c77 commit 0b244065a5e030979887837c12491e88769f8e37 @zarboz zarboz committed May 8, 2013
Showing with 13 additions and 13 deletions.
  1. +1 −1 drivers/mmc/core/mmc_ops.c
  2. +2 −2 drivers/usb/storage/transport.c
  3. +4 −4 net/netfilter/nf_conntrack_h323_main.c
  4. +6 −6 sound/usb/mixer.c
@@ -473,7 +473,7 @@ int mmc_set_block_length(struct mmc_card *card, u32 length)
int err;
int retries = 3;
struct mmc_command cmd;
- u32 status = {0};
+ u32 status = 0;
unsigned long delay = jiffies + HZ;
BUG_ON(!card);
@@ -356,7 +356,7 @@ static int usb_stor_bulk_transfer_sglist(struct us_data *us, unsigned int pipe,
int usb_stor_bulk_srb(struct us_data* us, unsigned int pipe,
struct scsi_cmnd* srb)
{
- unsigned int partial = {0};
+ unsigned int partial = 0;
int result = usb_stor_bulk_transfer_sglist(us, pipe, scsi_sglist(srb),
scsi_sg_count(srb), scsi_bufflen(srb),
&partial);
@@ -379,7 +379,7 @@ int usb_stor_bulk_transfer_sg(struct us_data* us, unsigned int pipe,
void *buf, unsigned int length_left, int use_sg, int *residual)
{
int result;
- unsigned int partial = {0};
+ unsigned int partial = 0;
/* are we scatter-gathering? */
if (use_sg) {
@@ -558,8 +558,8 @@ static int h245_help(struct sk_buff *skb, unsigned int protoff,
{
static MultimediaSystemControlMessage mscm;
unsigned char *data = NULL;
- int datalen = {0};
- int dataoff = {0};
+ int datalen = 0;
+ int dataoff = 0;
int ret;
@@ -1094,8 +1094,8 @@ static int q931_help(struct sk_buff *skb, unsigned int protoff,
{
static Q931 q931;
unsigned char *data = NULL;
- int datalen = {0};
- int dataoff = {0};
+ int datalen = 0;
+ int dataoff = 0;
int ret;
View
@@ -881,7 +881,7 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int c, cnt, val = {0}, err;
+ int c, cnt, val = 0, err;
ucontrol->value.integer.value[0] = cval->min;
if (cval->cmask) {
@@ -911,7 +911,7 @@ static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol, struct snd_ctl_e
static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int c, cnt, val = {0}, oval, err;
+ int c, cnt, val = 0, oval, err;
int changed = 0;
if (cval->cmask) {
@@ -1308,7 +1308,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int err, val = {0};
+ int err, val = 0;
err = get_cur_ctl_value(cval, cval->control << 8, &val);
if (err < 0 && cval->mixer->ignore_ctl_error) {
@@ -1325,7 +1325,7 @@ static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_procunit_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int val, oval = {0}, err;
+ int val, oval = 0, err;
err = get_cur_ctl_value(cval, cval->control << 8, &oval);
if (err < 0) {
@@ -1566,7 +1566,7 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl
static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int val = {0}, err;
+ int val = 0, err;
err = get_cur_ctl_value(cval, cval->control << 8, &val);
if (err < 0) {
@@ -1584,7 +1584,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol, struct snd_ctl_
static int mixer_ctl_selector_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct usb_mixer_elem_info *cval = kcontrol->private_data;
- int val, oval = {0}, err;
+ int val, oval = 0, err;
err = get_cur_ctl_value(cval, cval->control << 8, &oval);
if (err < 0) {

0 comments on commit 0b24406

Please sign in to comment.